fixed filters for AND not working