Filter is working
Working on uniting the filters and allowing to add custom filters