HSEARCH-1317


Also contains a further polishing of HSEARCH-1307