started to refactor filters