refactor a bit to ready for change that will highlight enclosed elements
now highlighting elements to be hidden. due for a bit of refactoring.
Merge remote-tracking branch 'origin/master'