Move clear-highlight mapping