Fix bugs search swap