Simplify search results update

Also some rename while there.

No functional change.
Fix a stale comment

No functional change.
Merge branch 'master' into search
Allow pruning promotions in qsearch

bench: 4623052