Improve filtering by subject