fix(filter): fix combining of and filters