Split out the updating of search from the invocation