cdmlib related part for fixing #2931 (Free text search - hit highlighting implemented), also some code reorganization
cdmlib related part for fixing #2931 (Free text search - hit highlighting implemented), also some code reorganization