Fix field value replacement

This change fixes a bug where edits to the field performed
while a search is in progress get messed up when a search
completes.