Moved highlight mapping to proper spot.