diff --git a/Web12306/js/otn/trainstationsuggest.js b/Web12306/js/otn/trainstationsuggest.js
index ecc8302..0a514f9 100644
--- a/Web12306/js/otn/trainstationsuggest.js
+++ b/Web12306/js/otn/trainstationsuggest.js
@@ -189,7 +189,7 @@
 		};
 
 		this.setQueryResult = function (result, queryCount) {
-			if (queryCount < startQueryLimit || isInQuery || isSuggestLoopDisabled)
+			if (queryCount < startQueryLimit || isInQuery || isSuggestLoopDisabled||sessmgr.currentProfile.inLoop)
 				return;
 
 			queryResult = result;
diff --git a/Web12306/js/ui/ui-autorefresh.js b/Web12306/js/ui/ui-autorefresh.js
index 831d930..8919d2a 100644
--- a/Web12306/js/ui/ui-autorefresh.js
+++ b/Web12306/js/ui/ui-autorefresh.js
@@ -314,9 +314,12 @@
 
 					$("#date_loop_editor>span.selected").removeClass("selected");
 					if (currentDateLoopIndex > sessMgr.currentProfile.dateloop.length - 1) {
-						sessMgr.currentProfile.depDate = $("#dep_date").val();
+						sessMgr.currentProfile.depDate = sessMgr.currentProfile.trueDate;
+						sessMgr.currentProfile.inLoop=false;
 						currentDateLoopIndex = -1;
 					} else {
+						sessMgr.currentProfile.trueDate=sessMgr.currentProfile.depDate;
+						sessMgr.currentProfile.inLoop=true;
 						sessMgr.currentProfile.depDate = sessMgr.currentProfile.dateloop[currentDateLoopIndex];
 						$("#date_loop_editor>span:eq(" + currentDateLoopIndex + ")").addClass("selected");
 					}