Simplify search results update

Also some rename while there.

No functional change.