Added some more filtering
Added some more filtering