Always wrap query filter with $query modifier