Fix on menu and API Controller resolution