Disable hl on search and fix SortIncludeBlocks so that it could handle blocks of one line