Major changes to Search Database