Add database type test when searching