HSEARCH-1384 Changing the API a the discussion with Sanne and Hardy