Changed SonarCmdi metadata indexer to differentiate on parent element.

Source/Country is indexed as-is, while other occurrences of Country are
prefixed with their parent element name.
Fixed bug in Searcher.highlightContent() when viewing whole article.