[Fixes#84328058] Fixes syntax error where we didn't pass correct locals to partial
[Fixes#83856364] Fixes a bunch of stupid things with the searcher.  Brings up to date.