BUGFIX: proper handling of top_menu_items