fixups and add_searchdomains