Issue #28: handle submenus