Merge pull request #329 from FinalsClub/315-editable-note-tags