Change glossary tagging to be done at item render

First pass attempt at tagging glossary items at render.