搜尋: stability improvements