Fixes for filters and query classes