Revert "remove tag functionality"

This reverts commit 6916fafe96c010bbb6e8b1484e9b77575d95409a.
Revert "Revert "remove tag functionality""

This reverts commit 670b03bfe2aaf505f4f148ec5ab7dad41fa8ed1f.