Version 3.1.5: * improve realtime highlight mechanism