Trying to get filters to work
Fixed merge conflicts