Fixed #7190: CPD Search doesn't work with or logic since upgrade
dev: index for or/and was wrong. also fixed less / greater then