diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example
index fc0ba11f2..ccd4f3c3f 100644
--- a/servatrice/servatrice.ini.example
+++ b/servatrice/servatrice.ini.example
@@ -471,5 +471,5 @@ max_decks_per_share=50
 
 ; Maximum number of share links a single user may create per day.
 ; A value of 0 disables the limit.
-; Default: 0
-max_shares_per_day=0
+; Default: 50
+max_shares_per_day=50
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 56aeedb9a..3dd7ab510 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -1082,7 +1082,7 @@ int Servatrice::getServerStatusUpdateTime() const
 
 int Servatrice::getDeckShareExpiryDays() const
 {
-    return settingsCache->value("deck_share/expiry_days", 7).toInt();
+    return qMax(1, settingsCache->value("deck_share/expiry_days", 7).toInt());
 }
 
 int Servatrice::getDeckShareCleanupInterval() const
@@ -1098,8 +1098,7 @@ int Servatrice::getDeckShareMaxDecksPerShare() const
 
 int Servatrice::getDeckShareMaxSharesPerDay() const
 {
-    // default: no limit
-    return settingsCache->value("deck_share/max_shares_per_day", 0).toInt();
+    return settingsCache->value("deck_share/max_shares_per_day", 50).toInt();
 }
 
 int Servatrice::getNumberOfTCPPools() const
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index 7a1456b2b..bb67d78eb 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1224,7 +1224,8 @@ bool Servatrice_DatabaseInterface::getDeckSharesForUser(int userId, QList<DeckSh
 
     QSqlQuery *query = prepareQuery("select s.id, s.name, UNIX_TIMESTAMP(s.created_at), "
                                     "UNIX_TIMESTAMP(s.expires_at), count(i.id) from {prefix}_deck_share s left join "
-                                    "{prefix}_deck_share_item i on i.share_id = s.id where s.created_by = :created_by "
+                                    "{prefix}_deck_share_item i on i.share_id = s.id "
+                                    "where s.created_by = :created_by and s.expires_at > now() "
                                     "group by s.id, s.name, s.created_at, s.expires_at order by s.created_at desc");
     query->bindValue(":created_by", userId);
     if (!execSqlQuery(query)) {
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 07bc227f4..c82a8dd73 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -621,9 +621,6 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId,
         const QString name = folderInfo.first;
         const bool ownPublic = folderInfo.second;
         const bool effectivePublic = inheritedPublic || ownPublic;
-        if (publicOnly && !effectivePublic) {
-            continue;
-        }
 
         ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
         newItem->set_id(folderIdValue);
@@ -633,6 +630,10 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId,
         if (!deckListHelper(newItem->id(), newItem->mutable_folder(), userId, effectivePublic, publicOnly)) {
             return false;
         }
+
+        if (publicOnly && !effectivePublic && newItem->mutable_folder()->items_size() == 0) {
+            folder->mutable_items()->RemoveLast();
+        }
     }
 
     query = sqlInterface->prepareQuery("select id, name, upload_time, is_public, banner_card_name, "
@@ -1033,11 +1034,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
         fileInfo->mutable_file()->set_is_public(cmd.has_is_public() && cmd.is_public());
         rc.setResponseExtension(re);
     } else if (cmd.has_deck_id()) {
-        QSqlQuery *query =
-            sqlInterface->prepareQuery("update {prefix}_decklist_files set name=:name, upload_time=NOW(), "
-                                       "content=:content, banner_card_name=:banner_card_name, "
-                                       "banner_card_provider=:banner_card_provider, color_identity=:color_identity, "
-                                       "tags=:tags where id = :id_deck and id_user = :id_user");
+        QString updateQuery = "update {prefix}_decklist_files set name=:name, upload_time=NOW(), content=:content, "
+                              "banner_card_name=:banner_card_name, banner_card_provider=:banner_card_provider, "
+                              "color_identity=:color_identity, tags=:tags";
+        if (cmd.has_is_public()) {
+            updateQuery += ", is_public=:is_public";
+        }
+        updateQuery += " where id = :id_deck and id_user = :id_user";
+
+        QSqlQuery *query = sqlInterface->prepareQuery(updateQuery);
         query->bindValue(":id_deck", cmd.deck_id());
         query->bindValue(":id_user", userInfo->id());
         query->bindValue(":name", deckName);
@@ -1046,6 +1051,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
         query->bindValue(":banner_card_provider", bannerCardProvider);
         query->bindValue(":color_identity", colorIdentity);
         query->bindValue(":tags", tagsJson);
+        if (cmd.has_is_public()) {
+            query->bindValue(":is_public", cmd.is_public() ? 1 : 0);
+        }
         if (!sqlInterface->execSqlQuery(query)) {
             return Response::RespContextError;
         }
@@ -1149,8 +1157,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const C
                                                            "created_by = :created_by and created_at >= "
                                                            "DATE_SUB(NOW(), INTERVAL 1 DAY)");
         countQuery->bindValue(":created_by", userInfo->id());
-        if (sqlInterface->execSqlQuery(countQuery) && countQuery->next() &&
-            countQuery->value(0).toInt() >= maxSharesPerDay) {
+        if (!sqlInterface->execSqlQuery(countQuery) || !countQuery->next()) {
+            return Response::RespContextError;
+        }
+        if (countQuery->value(0).toInt() >= maxSharesPerDay) {
             return Response::RespTooManyRequests;
         }
     }
@@ -1185,25 +1195,26 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const C
 
         // Drain the deck list before resolving each deck: getDeckFromDatabase
         // issues its own query on the same cached statement set.
-        QSqlQuery *query = sqlInterface->prepareQuery("select id from {prefix}_decklist_files where id_folder = "
-                                                      ":id_folder and id_user = :id_user");
+        QSqlQuery *query =
+            sqlInterface->prepareQuery("select id, color_identity from {prefix}_decklist_files where id_folder = "
+                                       ":id_folder and id_user = :id_user");
         query->bindValue(":id_folder", folderId);
         query->bindValue(":id_user", userInfo->id());
         if (!sqlInterface->execSqlQuery(query)) {
             return Response::RespContextError;
         }
-        QList<int> deckIds;
+        QList<std::pair<int, QString>> deckRows;
         while (query->next()) {
-            deckIds.append(query->value(0).toInt());
+            deckRows.append({query->value(0).toInt(), query->value(1).toString()});
         }
-        for (const int deckId : deckIds) {
+        for (const auto &[deckId, colorIdentity] : deckRows) {
             DeckList *deck;
             try {
                 deck = sqlInterface->getDeckFromDatabase(deckId, userInfo->id());
             } catch (Response::ResponseCode &r) {
                 return r;
             }
-            items.append(makeShareItemFromDeck(*deck, QString()));
+            items.append(makeShareItemFromDeck(*deck, colorIdentity));
             delete deck;
         }
     } else {