Some fixups in search