Port 2ee779dcd3 to glitch-soc

e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place.

Port a060beee72 to glitch-soc

Fixes #541.

See also the following commits:

- 0c3ce41031
- 268d90e810