Menu expanded

Safe to ignore all commits before Dec 10.
Expanded query menu.