Code aligned for new filters design
Code aligned with new enums names
Code aligned with new filters structure
Cod aligned with new properties names in filter-objects