diff --git a/e107_handlers/e_thumbnail_class.php b/e107_handlers/e_thumbnail_class.php
index 1cd0ab065..a6ab8c1ad 100644
--- a/e107_handlers/e_thumbnail_class.php
+++ b/e107_handlers/e_thumbnail_class.php
@@ -121,8 +121,8 @@ class e_thumbnail
 
 	private function parseRequest()
 	{
-		//echo 'e_query='.str_replace('&', '&', e_QUERY);
-		$e_QUERY = e_QUERY;
+
+		$e_QUERY = !empty($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : e_QUERY;
 
 		if(isset($_GET['id'])) // very-basic url-tampering prevention and path cloaking
 		{
@@ -139,9 +139,7 @@ class e_thumbnail
 		{
 			$this->_request['h'] = (int) $this->_request['h'];
 		}
-	//	file_put_contents(e_LOG."thumbRequests.log", var_export($this->_request, true)."\n\n", FILE_APPEND);
 
-		// parse_str($_SERVER['QUERY_STRING'], $this->_request);
 		return $this;
 	}
 
diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index 5916d1662..4e8255b85 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -881,11 +881,14 @@ class e107Test extends \Codeception\Test\Unit
 
 			public function testWysiwyg()
 			{
+				e107::getConfig()->setPref('wysiwyg', true)->save();
+				$tinyMceInstalled = e107::isInstalled('tinymce4');
+
 				$tests = array(
 					//input     => expected
-					'default'   => 'tinymce4',
+					'default'   => ($tinyMceInstalled) ? 'tinymce4' : 'bbcode',
 					'bbcode'    => 'bbcode',
-					'tinymce4'  => 'tinymce4'
+					'tinymce4'  => ($tinyMceInstalled) ? 'tinymce4' : 'bbcode',
 				);
 
 				foreach($tests as $input => $expected)