diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index 7cc481a..54444fb 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -807,8 +807,7 @@
 		@Override
 		public String generate(Type type, Type[] childrenTypes, String[] children, String[] childrenSideEffects,
 				String[] sideEffect) {
-			// TODO Auto-generated method stub
-			return null;// 戻り値Map
+			return null;
 		}
 	}, new Symbol.ICalculator() {
 		@Override
@@ -824,7 +823,7 @@
 
 			Expression arg1 = args.get(1);
 			if (arg1 instanceof JsonTerm) {
-				JsonTerm searcTerm = (JsonTerm) arg1;
+				JsonTerm searhTerm = (JsonTerm) arg1;
 				MapTerm result = new MapTerm();
 
 				
@@ -832,26 +831,24 @@
 					boolean flag = true;
 					if (searchFrom.get(key) instanceof JsonTerm) {
 						JsonTerm value = (JsonTerm) searchFrom.get(key);
-						
-						for (String key1 : value.keySet()) {
-							if (value.get(key1) instanceof Constant) {
-								Constant value1 = (Constant) searchFrom.get(key1);
-								for (String key2 : searcTerm.keySet()) {
-									if (!(key1.equals(key2))) {
+						for (String qKey : searhTerm.keySet()) {
+							for (String jsonKey : value.keySet()) {
+								if (value.get(jsonKey) instanceof Constant) {
+									Constant value1 = (Constant) searchFrom.get(jsonKey);	
+									if (!(jsonKey.equals(qKey))) {
 										continue;
 									}
-									if (searcTerm.get(key2) instanceof Constant) {
-										Constant val = (Constant) searcTerm.get(key2);
-										if (!(value1.getValue().equals(val.getValue()))) {
-											
+									if (searhTerm.get(qKey) instanceof Constant) {
+										Constant val = (Constant) searhTerm.get(qKey);
+										if (!(value1.getValue().equals(val.getValue()))) {			
 											flag = false;
 										}
 									}
+									break;
 								}
 							}
 						}
-						//全部あっていたら値を入れる(AND=blooeanがtrue)
-						if(flag) {
+						if (flag) {
 							result.insert(key,value);
 						}
 					} else if (searchFrom.get(key) instanceof MapTerm) {
@@ -860,7 +857,7 @@
 				}
 				return result;
 			}
-			return null; // しっかり Map を返せるように
+			return null; 
 		}
 	});
 	public static final Symbol nil = new Symbol("nil", 0, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {