Add tagging functionality, clean up urls. Fixes #2