Searchd fixes