added filter by type