Also fixed a bug realted to wrong highlighting if the node focus changes using the display.