Filter by type as well

This should not change which entities are displayed in by_age or
by_year_of_birth.