GR-43, expand filter options

Work in progress, to be tested in staging
Fine; also, the below is true if clause1 AND clause4, but I think that's inconsequential.