HSEARCH-1317 Javadoc and comments update/clarification