Correct DatabaseFinder