HSEARCH-1455

Follow up pull request