HSEARCH-1121 & HSEARCH-1547 & HSEARCH-1553

Almost good to go. Just some questions which I am added to the appropriate places