#94532 stored search improvements