GR-43, expand filter options

Work in progress, to be tested in staging
It doesn't appear to be used anywhere (as best i could tell from doing a code search)