fix issues with GSNOHIGHLIGHT
some more GSNOHIGHLIGHT issues