diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index 917bd2cfc..6423c581b 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -11,6 +11,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../cards/additional_info/deck_color_identity.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
 #include "../deck_editor/deck_state_manager.h"
@@ -324,7 +325,7 @@ bool AbstractTabDeckEditor::actSaveDeck()
         Command_DeckUpload cmd;
         cmd.set_deck_id(static_cast<google::protobuf::uint32>(loadedDeck.lastLoadInfo.remoteDeckId));
         cmd.set_deck_list(deckString.toStdString());
-        cmd.set_tags(loadedDeck.deckList.getTags().join(QStringLiteral(",")).toStdString());
+        cmd.set_color_identity(getDeckColorIdentity(loadedDeck.deckList, CardDatabaseManager::query()).toStdString());
 
         PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
         connect(pend, &PendingCommand::finished, this, &AbstractTabDeckEditor::saveDeckRemoteFinished);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 805df4912..93bac0ea3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -394,11 +394,7 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa
     cmd.set_path(targetPath.toStdString());
     cmd.set_deck_list(deckString.toStdString());
 
-    const CardRef bannerCard = deck.getBannerCard();
-    cmd.set_banner_card_name(bannerCard.name.toStdString());
-    cmd.set_banner_card_provider(bannerCard.providerId.toStdString());
     cmd.set_color_identity(getDeckColorIdentity(deck, CardDatabaseManager::query()).toStdString());
-    cmd.set_tags(deck.getTags().join(QStringLiteral(",")).toStdString());
 
     PendingCommand *pend = client->prepareSessionCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &TabDeckStorage::uploadFinished);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
index ff0fc02ed..9fff594ac 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
@@ -196,7 +196,10 @@ void RemotePublicDecksModel::addTreeItem(const ServerInfo_DeckStorage_TreeItem &
     entry.bannerCardName = QString::fromStdString(file.banner_card_name());
     entry.bannerCardProvider = QString::fromStdString(file.banner_card_provider());
     entry.colorIdentity = QString::fromStdString(file.color_identity());
-    const QString tagsString = QString::fromStdString(file.tags());
-    entry.tags = tagsString.split(QLatin1Char(','), Qt::SkipEmptyParts);
+    QStringList tags;
+    for (const auto &tag : file.tags()) {
+        tags.append(QString::fromStdString(tag));
+    }
+    entry.tags = tags;
     decks.append(entry);
 }