GR-43, expand filter options

Work in progress, to be tested in staging
Comment is to be removed, but I did want to point out this interesting behavior; can't parameterize on a field of the join table, it seems.