GR-43, expand filter options

Work in progress, to be tested in staging
Yes, although in most cases I intend to remove comments tagged "MK:"