Further cleanup of tag/url mess
Capitalize tag for display