Only define filter variables that are not default values.

and equally, as this is the reverse of the case above, this could also be removed.

I was being more careful on the fields with values to ensure we don't introduce any bugs.