Use less markup for links
Merge pull request #1193 from ZDroid/tag_way