Improve the indexing of a nodenames combined with highlighting

In issue CMS7-4951 there seems to have been chosen to fix the highlighting by optionally disable nodename indexing. Imo, the fix should be that the highlighting should keep working, regardless whether the nodename is indexed. I propose to index the nodename again, but also make sure that it handles highlighting correct