HSEARCH-1396 WIP