optimize queries for the menu
Merge branch 'master' into 2.5