simplify database lookup code by using the find-database method
Merge pull request #135 from mapleoin/find-database

simplify database lookup code by using the find-database method