Note that I addressed part of the issue in my PR for HSEARCH-2674 Open . Maybe it will be enough to close this ticket.