fixes
fixed conflict
search keep selection