HSEARCH-1342 &  HSEARCH-1340