Tidy up features
Allow links to have tags