using a common tag regex for searching and highlighting
Merge pull request #261 from kneufeld/master

using a common tag regex for searching and highlighting