Fixing search
Initial Fixes on p2p/dht Code