case 3287 - Fix when different case is used.
Merge branch 'case-3287' into new-search