Update tagging functionality
Merge branch 'alex'