Roundtrip works
Changed SearchType logic