Make filters_by_group an ordered dict so that they appear in predictable order in the menu.
Update tests to work with new filters_by_group dict format