Categories locators have changed
Merge pull request #572 from AndreiH/categories_loc

Categories locators have changed