Fix combined filters for OR queries