NEAR highlight fix for the 4.1c

First check ok, further check until next commit