Re-enabled tagging functionality.