Group select2 options for query selection
Remove queries from sidebar
Canonicalize query menu item name
Mark query menu item corresponding to current query as selected