Bug fixes for the locations sub-controllers.