Improve highlighting.
Fix bug in string comparison that produced false positives. Added highlighting.
Bug fix.
Update tooltip for proxy scanner module selection button.
Merge remote-tracking branch 'dma/develop' into develop