Fix/query menu item highlighting

https://www.openproject.org/work_packages/11113