Improve Search Performance V1 (#1404)