Update with improved search