A substantial but not major refactoring of how the filter menu is treated for observations.