fix typo, and combine filters of same type for efficiency