Fixed highlight regex. Optimization on the directory search class.