HSEARCH-1492 Add support to exclude the entity compared from the results
HSEARCH-1492 Review and cleanup of TODOs in the code