Highlighting search results: Added heuristic approach for common capital...

...izations, fixed indentions.

Used a branch now, I see only the changes you want to have. Hope it works...