diff --git a/classes/Browser.php b/classes/Browser.php
index ac25498..17fb69f 100644
--- a/classes/Browser.php
+++ b/classes/Browser.php
@@ -53,7 +53,7 @@ class Browser
 	{
 		if (strpos($destination, '://') === false)
 		{
-			$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
+			$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
 		}
 
 		header('Location: ' . $destination);
diff --git a/classes/Controller.php b/classes/Controller.php
index 8d3eaaa..dce6f3e 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -389,6 +389,10 @@ class Controller extends Object
 				{
 					$module_return = $module->return;
 				}
+				else
+				{
+					$module_return = array_merge($module_return, $module->return);
+				}
 			}
 
 			$display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));
diff --git a/jar.php b/jar.php
index 23ff5a4..21bc5f6 100755
--- a/jar.php
+++ b/jar.php
@@ -358,7 +358,7 @@ class Browser
 	{
 		if (strpos($destination, '://') === false)
 		{
-			$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
+			$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
 		}
 
 		header('Location: ' . $destination);
@@ -1417,6 +1417,10 @@ class Controller extends Object
 				{
 					$module_return = $module->return;
 				}
+				else
+				{
+					$module_return = array_merge($module_return, $module->return);
+				}
 			}
 
 			$display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));