add menu query support