Fix  search and update