diff --git a/dca/tl_content.php b/dca/tl_content.php
index 289b8f5..118faa6 100644
--- a/dca/tl_content.php
+++ b/dca/tl_content.php
@@ -59,7 +59,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_show_info'] = array
 (
       'label'                   => &$GLOBALS['TL_LANG']['tl_content']['aeo_show_info'],
       'exclude'                 => true,
-      'filter'                  => true,
+      'filter'                  => false,
       'search'                  => false,
       'inputType'               => 'checkbox',
       'eval'                    => array('tl_class'=>'w50')
@@ -69,8 +69,8 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['aeo_info_text'] = array
 (
       'label'                   => &$GLOBALS['TL_LANG']['tl_content']['aeo_info_text'],
       'exclude'                 => true,
-      'filter'                  => true,
-      'search'                  => true,
+      'filter'                  => false,
+      'search'                  => false,
 	  'inputType'               => 'textarea',
 	  'eval'                    => array('rte'=>'tinyMCE', 'tl_class'=>'clr')
 );
diff --git a/dca/tl_module.php b/dca/tl_module.php
index fae14ab..6fe8b82 100644
--- a/dca/tl_module.php
+++ b/dca/tl_module.php
@@ -64,7 +64,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_show_info'] = array
 (
       'label'                   => &$GLOBALS['TL_LANG']['tl_module']['aeo_show_info'],
       'exclude'                 => true,
-      'filter'                  => true,
+      'filter'                  => false,
       'search'                  => false,
       'inputType'               => 'checkbox',
       'eval'                    => array('tl_class'=>'w50')
@@ -74,8 +74,8 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_info_text'] = array
 (
       'label'                   => &$GLOBALS['TL_LANG']['tl_module']['aeo_info_text'],
       'exclude'                 => true,
-      'filter'                  => true,
-      'search'                  => true,
+      'filter'                  => false,
+      'search'                  => false,
 	  'inputType'               => 'textarea',
 	  'eval'                    => array('rte'=>'tinyMCE', 'tl_class'=>'clr')
 );
@@ -85,7 +85,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['aeo_disable'] = array
       'label'                   => &$GLOBALS['TL_LANG']['tl_module']['aeo_disable'],
 	  'default'                 => '',
       'exclude'                 => true,
-      'filter'                  => true,
+      'filter'                  => false,
       'search'                  => false,
       'inputType'               => 'checkbox',
       'eval'                    => array('tl_class'=>'long')
diff --git a/dca/tl_settings.php b/dca/tl_settings.php
index ce49a46..9f77223 100644
--- a/dca/tl_settings.php
+++ b/dca/tl_settings.php
@@ -144,7 +144,7 @@ class tl_settings_aeo extends \Backend
         }
         
         if (in_array('i18nl10n', $this->Config->getActiveModules())) {
-        	$languages = deserialize($GLOBALS['TL_CONFIG']['i18nl10n_languages']);
+        	$languages = \I18nl10n\Classes\I18nl10n::getInstance()->getAvailableLanguages(true, true);
 	        foreach ($languages as $language) {
 	        	array_push($arrLanguages, strtolower($language));
 	        }
diff --git a/util/AeoFrontendUtil.php b/util/AeoFrontendUtil.php
index 9c3af4f..7c207aa 100644
--- a/util/AeoFrontendUtil.php
+++ b/util/AeoFrontendUtil.php
@@ -104,7 +104,7 @@ class AeoFrontendUtil extends \Frontend {
 			  	}
 			  	if (in_array('i18nl10n', $this->Config->getActiveModules())) {
 			  		$this->AeoUtil->fixupCurrentLanguage();
-			  		if ($GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl']) {
+			  		if ($GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url') {
 			  			$folder .= $GLOBALS['TL_LANGUAGE'] . '/';
 			  		}
 					$folder .= $this->virtual_path.'/'.$GLOBALS['TL_LANGUAGE'];
@@ -122,7 +122,7 @@ class AeoFrontendUtil extends \Frontend {
 			  	$urlSuffix = '';
 			  	if (strlen($GLOBALS['TL_CONFIG']['urlSuffix']) > 0) {
 			  		if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
-			  		    $GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) {
+			  		    $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
 			  			$this->AeoUtil->fixupCurrentLanguage();
 			  			$urlSuffix .= '.'.$GLOBALS['TL_LANGUAGE'];
 			  		}
diff --git a/util/AeoRedirectUtil.php b/util/AeoRedirectUtil.php
index 1ce2c58..472653b 100644
--- a/util/AeoRedirectUtil.php
+++ b/util/AeoRedirectUtil.php
@@ -83,7 +83,7 @@ class AeoRedirectUtil extends \Frontend {
 			}
 			$i18nl10nLanguage = '';
 			if (in_array('i18nl10n', $this->Config->getActiveModules())) {
-		  		if ($GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl']) {
+		  		if ($GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url') {
 		  			$i18nl10nLanguage = $arrFragments[count($arrFragments) - 1];
 		  		}
 			}
@@ -128,11 +128,11 @@ class AeoRedirectUtil extends \Frontend {
 				
 				$strObfuscatedValues = $arrFragments[3];
 			    if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
-				     $GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) {
+				     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
 					$this->AeoUtil->fixupCurrentLanguage();
 					$strObfuscatedValues = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strObfuscatedValues);
 				}
-				$arrObfuscatedValues = explode('+', $strObfuscatedValues, 5);
+				$arrObfuscatedValues = explode(' ', $strObfuscatedValues, 5);
 				
 				$arrFragments[$i++] = 'n';
 				$arrFragments[$i++] = $arrObfuscatedValues[0];
@@ -160,7 +160,7 @@ class AeoRedirectUtil extends \Frontend {
 				}
 				
 			    if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
-				     $GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl'] &&
+				     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url' &&
 				     strlen($i18nl10nLanguage)) {
 		  			$arrFragments[$i++] = 'language';
 		  			$arrFragments[$i++] = $i18nl10nLanguage;
@@ -181,7 +181,7 @@ class AeoRedirectUtil extends \Frontend {
 			$url = $this->removeUrlPrefix($url);
 			if ($GLOBALS['TL_CONFIG']['addLanguageToUrl'] ||
 			    (in_array('i18nl10n', $this->Config->getActiveModules()) &&
-			     $GLOBALS['TL_CONFIG']['i18nl10n_addLanguageToUrl'])) {
+			     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'url')) {
 				$arrUrlFragments = explode('/', $url);
 				$url = $arrUrlFragments[1];
 			}
@@ -218,7 +218,7 @@ class AeoRedirectUtil extends \Frontend {
 			}
 		}
 		if (in_array('i18nl10n', $this->Config->getActiveModules()) &&
-		     $GLOBALS['TL_CONFIG']['i18nl10n_alias_suffix']) {
+		     $GLOBALS['TL_CONFIG']['i18nl10n_urlParam'] == 'alias') {
 			$this->AeoUtil->fixupCurrentLanguage();
 			$strUrl = str_replace('.'.$GLOBALS['TL_LANGUAGE'], '', $strUrl);
 		}
diff --git a/util/AeoUtil.php b/util/AeoUtil.php
index 1fe97f6..1c47ee1 100644
--- a/util/AeoUtil.php
+++ b/util/AeoUtil.php
@@ -97,7 +97,7 @@ class AeoUtil extends \Controller {
          if(
             ($selected_language) && 
             in_array($selected_language,
-                             deserialize($GLOBALS['TL_CONFIG']['i18nl10n_languages']))
+                             \I18nl10n\Classes\I18nl10n::getInstance()->getAvailableLanguages(true, true))
          ) {
             $_SESSION['TL_LANGUAGE'] = $GLOBALS['TL_LANGUAGE'] = $selected_language;
          } elseif(isset($_SESSION['TL_LANGUAGE'])) {