Yes it probably should be broadened, but enforcing what is already there would be a start!
As for the Police budgets - so do all other emergency services, the NHS, teachers, the armed forces etc etc - where do you draw the line?