[#32361] [3.x] Search tools fixes (Fix #2281)