improving search vastly, no backwards breakage