HSEARCH-1384 Default value is 1. Fixed a few things reported by Sanne.