GR-43, expand filter options

Work in progress, to be tested in staging
Can you change this to a normal comment explaining when it might be a hash (instead of the Q/A format)?