Fix to SearchDB