added filter on type