#94810 stored search form resetting and more fixes