Fix constaints issue
Refactor filter system