GR-43, expand filter options

Work in progress, to be tested in staging
see comment below on variable naming.