Changed order of highlightning/unhighlightning