Added filter by organization type