fix team tagging and membership