diff --git a/src/coverage_FUEL.sh b/src/coverage_FUEL.sh
index d460447..3d80691 100755
--- a/src/coverage_FUEL.sh
+++ b/src/coverage_FUEL.sh
@@ -3,8 +3,8 @@
 cp ../osmCoverage/dist/osmCoverage.jar .
 rm -r database
 mkdir database
-java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist
+java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel -DROP
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToCartoCSV
diff --git a/src/osm/jp/coverage/fuel/DbExist.java b/src/osm/jp/coverage/fuel/DbExist.java
index 014d515..825423d 100644
--- a/src/osm/jp/coverage/fuel/DbExist.java
+++ b/src/osm/jp/coverage/fuel/DbExist.java
@@ -196,8 +196,12 @@
         long counter = 0L;
         try {
             osmdb =  DatabaseTool.openDb("osmdb");
+            String sqlSelect = "SELECT tags,id,ST_Y(ST_Transform(way,4326)) as lat,ST_X(ST_Transform(way,4326)) as lon";
+            String sqlWhere = String.format("WHERE (osm_id=id AND '%s'=ANY(tags) AND '%s'=ANY(tags))", kStr, vStr);
+            String sql = String.format("%s FROM planet_osm_point,planet_osm_nodes %s", sqlSelect, sqlWhere);
+            System.out.println(sql);
             
-            PreparedStatement ps1 = osmdb.prepareStatement("SELECT id,tags,lat,lon FROM planet_osm_nodes WHERE '"+ kStr +"'=ANY(tags) AND '"+ vStr +"'=ANY(tags)");
+            PreparedStatement ps1 = osmdb.prepareStatement(sql);
             try (ResultSet rset1 = ps1.executeQuery()) {
                 while (rset1.next()) {
                     String tags = rset1.getString("tags");
diff --git a/test/osm/jp/coverage/fuel/DbFuelTest.java b/test/osm/jp/coverage/fuel/DbFuelTest.java
index 54cbef7..bd24b51 100644
--- a/test/osm/jp/coverage/fuel/DbFuelTest.java
+++ b/test/osm/jp/coverage/fuel/DbFuelTest.java
@@ -32,7 +32,7 @@
     @Test
     public void test00_main() throws Exception {
         try {
-            String[] args = new String[0];
+            String[] args = new String[]{"-DROP"};
             DbFuel.main(args);
         }
         catch(IOException | ClassNotFoundException | SQLException | ParserConfigurationException | SAXException e) {