using a common tag regex for searching and highlighting

same number of tests pass after my refactoring