refactored the filter modules and added/edited some new filter objects