Improve quality of ControllerLocator