Simplify tags, pass 1

Getting rid of tag name/url separation.