diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlyLookupMatchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlyLookupMatchJob.java
index ffa52f2d36..e925f07db8 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlyLookupMatchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlyLookupMatchJob.java
@@ -23,8 +23,7 @@ class FloodOnlyLookupMatchJob extends JobImpl implements ReplyJob {
     }
 
     public void runJob() { 
-        if ( (getContext().netDb().lookupLeaseSetLocally(_search.getKey()) != null) ||
-             (getContext().netDb().lookupRouterInfoLocally(_search.getKey()) != null) ) {
+        if (getContext().netDb().lookupLocally(_search.getKey()) != null) {
             if (_log.shouldLog(Log.INFO))
                 _log.info(_search.getJobId() + ": search match and found locally");
             _search.success();
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java
index 3078ec1a1c..302f6d3241 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java
@@ -190,6 +190,7 @@ class FloodOnlySearchJob extends FloodSearchJob {
             failed();
         }
     }
+
     @Override
     public String getName() { return "NetDb flood search (phase 1)"; }
     
@@ -224,11 +225,12 @@ class FloodOnlySearchJob extends FloodSearchJob {
         getContext().statManager().addRateData("netDb.failedTime", System.currentTimeMillis()-_created, System.currentTimeMillis()-_created);
         synchronized (_onFailed) {
             for (int i = 0; i < _onFailed.size(); i++) {
-                Job j = (Job)_onFailed.remove(0);
+                Job j = _onFailed.remove(0);
                 getContext().jobQueue().addJob(j);
             }
         }
     }
+
     @Override
     void success() {
         synchronized (this) {
@@ -255,7 +257,7 @@ class FloodOnlySearchJob extends FloodSearchJob {
         getContext().statManager().addRateData("netDb.successTime", System.currentTimeMillis()-_created, System.currentTimeMillis()-_created);
         synchronized (_onFind) {
             while (!_onFind.isEmpty())
-                getContext().jobQueue().addJob((Job)_onFind.remove(0));
+                getContext().jobQueue().addJob(_onFind.remove(0));
         }
     }
 }