fix determening current menu items