CR for Job #19975 - Improve search

Code Review for Job #19975 - Workitem available at https://www.worklist.net/19975