Move more functionality to urgency category controller