diff --git a/src/Resources/contao/classes/TagHelper.php b/src/Resources/contao/classes/TagHelper.php
index 0945d07..4c5072a 100644
--- a/src/Resources/contao/classes/TagHelper.php
+++ b/src/Resources/contao/classes/TagHelper.php
@@ -3,6 +3,7 @@
 namespace Hschottm\TagsBundle;
 
 use Contao\Backend;
+use Contao\Environment;
 use Contao\Module;
 use Contao\Input;
 use Contao\Database;
@@ -262,9 +263,9 @@ public function getTagsAndTaglistForIdAndTable($id, $table, $jumpto)
 		$taglist = array();
 		foreach ($tags as $id => $tag)
 		{
-			$strUrl = \Contao\StringUtil::ampersand($pageObj->getFrontendUrl('/tag/' . TagHelper::encode($tag)));
-			if (strlen(Contao\Environment::get('queryString'))) $strUrl .= "?" . \Contao\Environment::get('queryString');
-			$tags[$id] = '<a href="' . $strUrl . '">' . \Contao\StringUtil::specialchars($tag) . '</a>';
+			$strUrl = StringUtil::ampersand($pageObj->getFrontendUrl('/tag/' . TagHelper::encode($tag)));
+			if (strlen(Environment::get('queryString'))) $strUrl .= "?" . Environment::get('queryString');
+			$tags[$id] = '<a href="' . $strUrl . '">' . StringUtil::specialchars($tag) . '</a>';
 			$taglist[$id] = array(
 				'url' => $tags[$id],
 				'tag' => $tag,
diff --git a/src/Resources/contao/modules/ModuleCalendarTags.php b/src/Resources/contao/modules/ModuleCalendarTags.php
index 1a7fc48..24c6668 100644
--- a/src/Resources/contao/modules/ModuleCalendarTags.php
+++ b/src/Resources/contao/modules/ModuleCalendarTags.php
@@ -4,6 +4,7 @@
 
 use Contao\ModuleCalendar;
 use Contao\Input;
+use Contao\Database;
 
 /**
  * Contao Open Source CMS - tags extension
@@ -132,4 +133,4 @@ protected function getFilterTags()
 			return array();
 		}
 	}
-}
\ No newline at end of file
+}