Move search out into a passthrough