Moved manage_org locator under menu_locator dict