GR-43, expand filter options

Work in progress, to be tested in staging
This routine, already factored once, is up against the rubocop MethodLength limit, and with the longer variable would exceed the rubocop LineLength limit by (annoyingly) one character on line 263. May I be granted a rubocop:disable?