Better handling for transport-level problems
Retooling some of the search pieces