GR-43, expand filter options

Work in progress, to be tested in staging
Is this really necessary? Your editor should be auto-completing variables anyway. I'd rather have the 2 extra characters and have the code read nicer.