Categories, Locations are now displayed correctly on pop-up menus