Refactored away a separate find call outside the db library.