HSEARCH-1315


Continuing the improvements started by @nicolashelleringer on pull #416

https://hibernate.atlassian.net/browse/HSEARCH-1315