Added entity filtering by coarse type.