Added filter set
Improvements of FilterSet
Cleanup and refactorings