Add filters logic and styles
Merge conflict