LPS-33653 fix search issues