HCSVLAB-364: Fixed some bugs on hyphenated words search.