Made the search ability work the same way as with the rest of the
network
connections. Removed some of the unorthodox methods of variable passing
to use some more standard approaches.