Cleanup code for validations in filters

[tonyfujs]

Adding a new parameter implies modifying the code in multiple places currently. This is very cumbersome and error prone . Review and re-factor.