Fixed bug with filtering
Fixed merge conflict