SONAR-5056 Improve characteristic search