diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
index 3262d2ed4..73eba0e0a 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
@@ -564,7 +564,7 @@ public class FloodfillNetworkDatabaseSegmentor extends SegmentedNetworkDatabaseF
         }
         FloodfillNetworkDatabaseFacade fndb = _context.mainNetDb();
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("store " + key.toBase32() + " to floodfill");
+            _log.debug("store " + key.toBase32() + " to main");
         return fndb.store(key, leaseSet);
     }
 
@@ -580,7 +580,7 @@ public class FloodfillNetworkDatabaseSegmentor extends SegmentedNetworkDatabaseF
         }
         FloodfillNetworkDatabaseFacade fndb = _context.mainNetDb();
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("store " + key.toBase32() + " to floodfill");
+            _log.debug("store " + key.toBase32() + " to main");
         return fndb.store(key, routerInfo);
     }
 
@@ -904,8 +904,11 @@ public class FloodfillNetworkDatabaseSegmentor extends SegmentedNetworkDatabaseF
     public List<BlindData> getLocalClientsBlindData() {
         ArrayList<BlindData> rv = new ArrayList<>();
         for (String subdb : _subDBs.keySet()) {
-            if (subdb.startsWith("clients_"))
-                ;
+            // if (subdb.startsWith("clients_"))
+            // TODO: see if we can access only one subDb at a time when we need
+            // to look up a client by SPK. We mostly need this for managing blinded
+            // and encrypted keys in the Keyring Config UI page. See also
+            // ConfigKeyringHelper
             rv.addAll(_subDBs.get(subdb).getBlindData());
         }
         return rv;
@@ -915,8 +918,11 @@ public class FloodfillNetworkDatabaseSegmentor extends SegmentedNetworkDatabaseF
     public List<String> lookupClientBySigningPublicKey(SigningPublicKey spk) {
         List<String> rv = new ArrayList<>();
         for (String subdb : _subDBs.keySet()) {
-            if (subdb.startsWith("clients_"))
-                ;
+            // if (subdb.startsWith("clients_"))
+            // TODO: see if we can access only one subDb at a time when we need
+            // to look up a client by SPK. We mostly need this for managing blinded
+            // and encrypted keys in the Keyring Config UI page. See also
+            // ConfigKeyringHelper
             BlindData bd = _subDBs.get(subdb).getBlindData(spk);
             if (bd != null) {
                 rv.add(subdb);