HSEARCH-1556 & HSEARCH-1557 & HSEARCH-1560

Same same, just rebased