Updates to Database and FieldSearch

I updated these two classes to interact as Mitchell suggested via email.