diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index c6c46e433..b9355e67f 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -36,9 +36,14 @@ if (isset($_GET["day"])&&is_numeric($_GET["day"])) $day=$_GET["day"];
 else $day = (int)date("d", $currDate);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user,'mode'=>$mode, 'year'=>$year, 'month'=>$month, 'day'=>$day, 'firstdayofweek'=>$settings->_firstDayOfWeek));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('mode', $mode);
+	$view->setParam('year', $year);
+	$view->setParam('month', $month);
+	$view->setParam('day', $day);
+	$view->setParam('firstdayofweek', $settings->_firstDayOfWeek);
+	$view($_GET);
 	exit;
 }
 
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 7ca947308..816e56d86 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -182,6 +182,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 		print "</table>\n";
 	} /* }}} */
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];