Better mappings for the search stuff and smarter options
Upgrades to shai-hulud