Gr 43 expand filter options

Work in progress, to be tested in staging