Fix filtering by subject