GR-43, expand filter options

Work in progress, to be tested in staging
Indent this (and line 47) 2 spaces