Add tag feature and display in client