diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js
index 1b308efc8..6afa17146 100644
--- a/admin-dev/themes/default/js/date-range-picker.js
+++ b/admin-dev/themes/default/js/date-range-picker.js
@@ -400,7 +400,7 @@
 									$(".start-selected-compare").removeClass("start-selected-compare");
 									target.addClass("start-selected-compare");
 									startCompare = target.data("val");
-									$("#compare-date-start").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d')));
+									$("#date-start-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d')));
 								} else {
 									$(".start-selected").removeClass("start-selected");
 									target.addClass("start-selected");
@@ -411,7 +411,7 @@
 								if(!switched) {click = 1;} else {click = 2;}
 								if(!switched){
 									if (compare) {
-										$("#compare-date-end").val(null).focus().addClass("input-selected");
+										$("#date-end-compare").val(null).focus().addClass("input-selected");
 										target.addClass("start-selected-compare").addClass("end-selected-compare");
 									} else {
 										$("#date-end").val(null).focus().addClass("input-selected");
@@ -420,7 +420,7 @@
 								}
 
 								if (compare)
-									$("#compare-date-start").removeClass("input-selected").addClass("input-complete");
+									$("#date-start-compare").removeClass("input-selected").addClass("input-complete");
 								else
 									$("#date-start").removeClass("input-selected").addClass("input-complete");
 							}
@@ -430,9 +430,9 @@
 									$(".end-selected-compare").removeClass("end-selected-compare");
 									target.addClass("end-selected-compare");
 									endCompare = target.data("val");
-									$("#compare-date-end").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d')));
+									$("#date-end-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d')));
 									click = 2;
-									$("#compare-date-end").removeClass("input-selected").addClass("input-complete");
+									$("#date-end-compare").removeClass("input-selected").addClass("input-complete");
 								} else {
 									$(".end-selected").removeClass("end-selected");
 									target.addClass("end-selected");
@@ -516,8 +516,8 @@
 					if (startCompare && over < startCompare)
 					{
 						endCompare = startCompare;
-						$("#compare-date-end").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
-						$("#compare-date-start").val(null).focus().addClass("input-selected");
+						$("#date-end-compare").val(DPGlobal.formatDate(new Date(startCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
+						$("#date-start-compare").val(null).focus().addClass("input-selected");
 						$("#datepicker .start-selected-compare").removeClass("start-selected-compare").addClass("end-selected-compare");
 						startCompare = null;
 						switched = true;
@@ -525,8 +525,8 @@
 					else if (endCompare && over > endCompare)
 					{
 						startCompare = endCompare;
-						$("#compare-date-start").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
-						$("#compare-date-end").val(null).focus().addClass("input-selected");
+						$("#date-start-compare").val(DPGlobal.formatDate(new Date(endCompare), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
+						$("#date-end-compare").val(null).focus().addClass("input-selected");
 						$("#datepicker .end-selected-compare").removeClass("end-selected-compare").addClass("start-selected-compare");
 						endCompare = null;
 						switched = false;
diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
index bc00518e5..786a17df4 100644
--- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
@@ -57,11 +57,11 @@
 						</button>
 
 					</div>
-					<div class="form-date-body" id="compare-form-date-body" style="display: none;">
+					<div class="form-date-body" id="form-date-body-compare" style="display: none;">
 						<label>{l s='From'}</label>
-						<input id="compare-date-start" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" />
+						<input id="date-start-compare" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" />
 						<label>{l s='to'}</label>
-						<input id="compare-date-end" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" />
+						<input id="date-end-compare" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" />
 					</div>
 				</div>
 				<div class='form-date-actions'>
@@ -125,14 +125,14 @@
 			$(this).addClass("input-selected");
 		});
 
-		$("#compare-date-start").focus(function() {
+		$("#date-start-compare").focus(function() {
 			datepickerStart.setCompare(true);
 			datepickerEnd.setCompare(true);
 			$(".date-input").removeClass("input-selected");
 			$(this).addClass("input-selected");
 		});
 
-		$("#compare-date-end").focus(function() {
+		$("#date-end-compare").focus(function() {
 			datepickerStart.setCompare(true);
 			datepickerEnd.setCompare(true);
 			$(".date-input").removeClass("input-selected");
@@ -149,18 +149,18 @@
 
 		$('#datepicker-compare').click(function() {
 			if ($(this).attr("checked")) {
-				datepickerStart.setStartCompare($("#compare-date-start").val());
-				datepickerStart.setEndCompare($("#compare-date-end").val());
-				datepickerEnd.setStartCompare($("#compare-date-start").val());
-				datepickerEnd.setEndCompare($("#compare-date-end").val());
-				$('#compare-form-date-body').show();
-				$('#compare-date-start').focus();
+				datepickerStart.setStartCompare($("#date-start-compare").val());
+				datepickerStart.setEndCompare($("#date-end-compare").val());
+				datepickerEnd.setStartCompare($("#date-start-compare").val());
+				datepickerEnd.setEndCompare($("#date-end-compare").val());
+				$('#form-date-body-compare').show();
+				$('#date-start-compare').focus();
 			} else {
 				datepickerStart.setStartCompare(null);
 				datepickerStart.setEndCompare(null);
 				datepickerEnd.setStartCompare(null);
 				datepickerEnd.setEndCompare(null);
-				$('#compare-form-date-body').hide();
+				$('#form-date-body-compare').hide();
 				$('#date-start').focus();
 			}
 		})