No longer filter by type.