modifying menu queries to improve app performance