Changes to handle links in tags. Untested.
Link as keyword handling fixed.