better search code path for #11