Refactor code to resolve #2227 and #2188
Merge pull request #2241 from pinkfloyda/tooltip_whitelist

Refactor code to resolve #2227 and #2188