diff --git a/src/osm/jp/coverage/fuel/DbExist.java b/src/osm/jp/coverage/fuel/DbExist.java
index 0af32eb..763f8fd 100644
--- a/src/osm/jp/coverage/fuel/DbExist.java
+++ b/src/osm/jp/coverage/fuel/DbExist.java
@@ -101,8 +101,8 @@
         // 通常 → ５０ポイント
         // BRANDなし → １ポイント
         // FIXMEあり → １ポイント
-        readExisting(hsqldb, "\"where amenity='fuel'\"", POINT_BRAND | POINT_FIXME);
-        //readExistingSub(hsqldb, "disused:amenity", "fuel", POINT_BRAND | POINT_FIXME);
+        readExisting(hsqldb, "where amenity='fuel'", POINT_BRAND | POINT_FIXME);
+        readExistingSub(hsqldb, "disused:amenity", "fuel", POINT_BRAND | POINT_FIXME);
     }
     
     /**
@@ -140,15 +140,15 @@
         long counter = 0L;
         try {
             osmdb =  DatabaseTool.openDb("osmdb");
-            
-            PreparedStatement ps1 = osmdb.prepareStatement("select osm_id,brand,disused,name,ST_Y(ST_Transform(way,4326)) as lat,ST_X(ST_Transform(way,4326)) as lon from planet_osm_point " + sqlWhere);
+            String sqlNode = "select osm_id,brand,disused,name,ST_Y(ST_Transform(way,4326)) as lat,ST_X(ST_Transform(way,4326)) as lon from planet_osm_point " + sqlWhere;
+            PreparedStatement ps1 = osmdb.prepareStatement(sqlNode);
             try (ResultSet rset1 = ps1.executeQuery()) {
                 while (rset1.next()) {
                     counter += importExistingNode(hsqldb, osmdb, rset1, point);
                 }
             }
-            
-            PreparedStatement ps2 = osmdb.prepareStatement("select osm_id,brand,disused,name,ST_Y(ST_Transform(ST_Centroid(way),4326)) as lat,ST_X(ST_Transform(ST_Centroid(way),4326)) as lon from planet_osm_polygon " + sqlWhere);
+            String sqlArea = "select osm_id,brand,disused,name,ST_Y(ST_Transform(ST_Centroid(way),4326)) as lat,ST_X(ST_Transform(ST_Centroid(way),4326)) as lon from planet_osm_polygon " + sqlWhere;
+            PreparedStatement ps2 = osmdb.prepareStatement(sqlArea);
             try (ResultSet rset2 = ps2.executeQuery()) {
                 while (rset2.next()) {
                     counter += importExistingNode(hsqldb, osmdb, rset2, point);
@@ -188,9 +188,7 @@
         try {
             osmdb =  DatabaseTool.openDb("osmdb");
             
-            PreparedStatement ps1 = osmdb.prepareStatement("SELECT osm_id, brand, name, disused, tags FROM planet_osm_point, planet_osm_nodes WHERE osm_id=id AND tags=ANY('"+ kStr +"')");
-            ps1.setString(1, kStr);
-            ps1.setString(2, vStr);
+            PreparedStatement ps1 = osmdb.prepareStatement("SELECT osm_id,brand,name,disused,tags,ST_Y(ST_Transform(way,4326)) as lat,ST_X(ST_Transform(way,4326)) as lon FROM planet_osm_point,planet_osm_nodes WHERE osm_id=id AND '"+ kStr +"'=ANY(tags) AND '"+ vStr +"'=ANY(tags)");
             try (ResultSet rset1 = ps1.executeQuery()) {
                 while (rset1.next()) {
                     String tags = rset1.getString("tags");
@@ -218,8 +216,7 @@
                     }
                 }
             }
-            /*
-            PreparedStatement ps2 = osmdb.prepareStatement("SELECT osm_id,brand,disused,name,ST_Y(ST_Transform(ST_Centroid(way),4326)) as lat,ST_X(ST_Transform(ST_Centroid(way),4326)) as lon FROM planet_osm_polygon, planet_osm_nodes  WHERE osm_id=id AND tags= ANY(?) AND tags=ANY(?)");
+            PreparedStatement ps2 = osmdb.prepareStatement("SELECT osm_id,brand,disused,name,tags,ST_Y(ST_Transform(ST_Centroid(way),4326)) as lat,ST_X(ST_Transform(ST_Centroid(way),4326)) as lon FROM planet_osm_polygon, planet_osm_nodes  WHERE osm_id=id '"+ kStr +"'=ANY(tags) AND '"+ vStr +"'=ANY(tags)");
             ps2.setString(1, kStr);
             ps2.setString(2, vStr);
             try (ResultSet rset2 = ps2.executeQuery()) {
@@ -227,7 +224,6 @@
                     counter += importExistingNode(hsqldb, osmdb, rset2, point);
                 }
             }
-*/
             System.out.println("Exists Node count = " + counter);
         }
         finally {
diff --git a/test/osm/jp/coverage/fuel/DbExistTest.java b/test/osm/jp/coverage/fuel/DbExistTest.java
index fac61e3..4426746 100644
--- a/test/osm/jp/coverage/fuel/DbExistTest.java
+++ b/test/osm/jp/coverage/fuel/DbExistTest.java
@@ -231,8 +231,8 @@
     
     boolean checkRenge(double d1, String str) throws SQLException {
         double base = Double.parseDouble(str);
-        double up = d1 + 0.00000005D;
-        double down = d1 - 0.00000005D;
+        double up = d1 + 0.0000005D;
+        double down = d1 - 0.0000005D;
         boolean ret = true;
         if (Double.compare(base, up) > 0) {
             ret = false;