fixed submenus and added 'destination' flag