Locator Performance and Category Improvements