Fix tests on search for analysis
Merge branch 'fixsearch' into feature-cleanup