* Merge remote-tracking branch 'upstream/main' * rm search terms alias (ended up not using it) * typo fix