Highlighting responsiveness improved (and fixed calls)