diff --git a/plugins/staticpages/functions.inc b/plugins/staticpages/functions.inc
index 8b179f992..093c01407 100755
--- a/plugins/staticpages/functions.inc
+++ b/plugins/staticpages/functions.inc
@@ -1646,6 +1646,11 @@ function plugin_migrate_staticpages($old_conf)
  */
 function plugin_autouninstall_staticpages()
 {
+    
+    // Delete multi-language support Core Config option for Staticpage Plugin
+    $c = config::get_instance();
+    $c->del('langurl_staticpages', 'Core');
+    
     $out = array(
         /* give the name of the tables, without $_TABLES[] */
         'tables'     => array('staticpage'),
diff --git a/plugins/staticpages/install_defaults.php b/plugins/staticpages/install_defaults.php
index 861d6dfbb..750da6612 100644
--- a/plugins/staticpages/install_defaults.php
+++ b/plugins/staticpages/install_defaults.php
@@ -206,6 +206,9 @@ function plugin_initconfig_staticpages()
                 0, 0, 0, 128, true, 'staticpages', 0);
         $c->add('default_cache_time', $_SP_DEFAULT['default_cache_time'], 'text',
                 0, 0, null, 129, true, 'staticpages', 0);
+        $c->add('langurl_staticpages',array('staticpages', 'index.php', 'page'),'@hidden'
+                ,0, 0, null, 130, true, 'staticpages', 0);
+        $c->add('langurl_staticpages',array('staticpages', 'index.php', 'page'),'@hidden',7,31,1,1830,TRUE, 'Core', 31); // Hidden config option for Core used to determine language of staticpage url (see _getLanguageInfoFromURL in lib-common)
 
         $c->add('tab_whatsnew', NULL, 'tab', 0, 1, NULL, 0, true, 'staticpages', 1);
         $c->add('fs_whatsnew', NULL, 'fieldset', 0, 1, NULL, 0, true, 'staticpages', 1);
diff --git a/public_html/admin/install/config-install.php b/public_html/admin/install/config-install.php
index 8703b4d2c..77b50c7f6 100644
--- a/public_html/admin/install/config-install.php
+++ b/public_html/admin/install/config-install.php
@@ -416,6 +416,8 @@ function install_config()
     $c->add('page_navigation_max_pages',7,'text',7,31,NULL,1800,TRUE, $me, 31);
     $c->add('default_cache_time_block',0,'text',7,31,NULL,1810,TRUE, $me, 31);
     $c->add('titletoid',0,'select',7,31,1,1820,TRUE, $me, 31);
+    $c->add('langurl_topic',array('', 'index.php', 'topic'),'@hidden',7,31,1,1830,TRUE, $me, 31); // Hidden config option for Core used to determine language of topic url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, $me, 31); // Hidden config option for Core used to determine language of article url (see _getLanguageInfoFromURL in lib-common)
 
     $c->add('tab_debug', NULL, 'tab', 7, 32, NULL, 0, TRUE, $me, 32);
     $c->add('fs_debug', NULL, 'fieldset', 7, 32, NULL, 0, TRUE, $me, 32);
diff --git a/public_html/article.php b/public_html/article.php
index 4cf65146e..b17e46ea8 100644
--- a/public_html/article.php
+++ b/public_html/article.php
@@ -111,17 +111,6 @@ function extractExternalLinks($text) {
     COM_handle404();
 }
 
-// If user is allowed to switch languages
-if ($_CONF['allow_user_language'] == 1) {
-    // Let's figure out if page is for specific language
-    // If so let URL class know in case user changes language
-    $article_lang = COM_getLanguageIdForObject($sid);
-    if (!empty($sid) AND !empty($article_lang)) {
-        $_URL->setItemInfo($sid, $article_lang);
-    }
-}
-
-
 // Get topic
 TOPIC_getTopic('article', $sid);
 
diff --git a/public_html/index.php b/public_html/index.php
index a67831a49..b6f48ab3b 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -118,16 +118,6 @@ function fixTopic(&$A, $tid_list)
     $page = (int) Geeklog\Input::get('page', 0);
 }
 
-// If user is allowed to switch languages
-if ($_CONF['allow_user_language'] == 1) {
-    // Let's figure out if topic is for specific language
-    // If so let URL class know in case user changes language
-    $topic_lang = COM_getLanguageIdForObject($topic);
-    if (!empty($topic) AND !empty($topic_lang)) {
-        $_URL->setItemInfo($topic, $topic_lang);
-    }
-}
-
 if ($topic_check === '-') {
     $topic_check = '';
 }
diff --git a/public_html/lib-common.php b/public_html/lib-common.php
index d06661dd1..586bed9b0 100644
--- a/public_html/lib-common.php
+++ b/public_html/lib-common.php
@@ -6682,7 +6682,8 @@ function COM_getLanguage()
 
     // 1. Try to get language from URL
     // $langFile = COM_getLanguageFromBrowser(); - Removed line as it doesn't work with the switch language block (that uses phpblock_switch_language) for some setups when a language cookie is set, need to check that first. 
-    $langFile = _getLanguageFromURL();
+    $langURLinfo = _getLanguageInfoFromURL();
+    $langFile = $langURLinfo[0];
 
     if (empty($langFile)) {
         if (!empty($_USER['language'])) {
@@ -6711,83 +6712,80 @@ function COM_getLanguage()
 }
 
 /**
- * Get language name from current URL 
+ * Get language name and plugin name and id from current URL 
  * Note: This function starts with _ therefore it should only call from within core
  * 
- *
- * @return string       e.g., 'english', 'japanese', ...
- * @note   code provided by hiroron
- */
-function _getLanguageFromURL()
+ * @param       boolean    Tells function to return either language or id of plugin item if found
+ * @return      array       e.g., 'english', 'japanese', ... , plugin name, id
+  */
+function _getLanguageInfoFromURL()
 {
     global $_CONF, $_URL;
 
-    $retval = '';
+    $retval = array('','','');
     
     // If user is allowed to switch languages
     if ($_CONF['allow_user_language'] == 1) {
         $langId = '';
-        // Need to see if language is set for url
-        if (!$_URL->itemSet()) {
-            // THERE ARE ISSUES with this and figuring out the language from the URL may be incorrect if for example "_en" is found elsewhere in the url (see https://github.com/Geeklog-Core/geeklog/issues/819)
-            // This is used if the anonymous user visits the page directly to figure out what language to display the site in.
-            // If the user is logged in or has a language cookie already set (by the switch language block) from before then that language is taken (done at the beginning of lib-common)
-            
-            // We need to figure out if there is a specific language specified in the url
-            // Since COM_getLanguage is called right at the beginning of lib-common we don't have the option of setting the $_URL language before hand
-            // so we must make our best guess based on the type of URL (normal, rewritten, routing)
-            
-            // Another problem is we don't try to figure out if the item supports multiple language (article, topic, staticpage, other plugin)
-            
-             $url = COM_getCurrentURL();
-
+        // Need to see if language is set for url. Supports normal, rewrite, and routing urls.
+        // To support multi-language items plugins need to include an extra config option for Core that is called langurl_pluginname
+        // This allows this function to figure out by looping through these config options langurl_ what plugin the url is for and if it is an 
+        // item that supports multiple languages. 
+        // This function is used by COM_getLanguage which is called for anonymous visitors when then first visit a page. It is called very early in the process
+        // so no plugin config options or actual functions are available so that is why we need to store the config option in Core since these are already loaded and 
+        // we already know which plugins are enabled.
+        // This function also allows the switch block (phpblock_switch_language) to determine if the url is of an item of a plugin which supports multiple languages.
+        // This means the plugin must also support PLG_getItemInfo (specifically checking the id) so the new id with the switched language of the item can be checked to see if it exists or not.
+        // Below are example config values for Article, Topic and Staticpages which all support multiple languages.
+        // To support multiple languages, the config option langurl_pluginname must contain an array that returns the directory, the file name, and the url variable of the supported url.
+        // Keep the rest of the settings after the array the same.
+        // $c->add('langurl_topic',array('', 'index.php', 'topic'),'@hidden',7,31,1,1830,TRUE, 'Core', 31);
+        // $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, 'Core', 31);
+        // $c->add('langurl_staticpages',array('staticpages', 'index.php', 'page'),'@hidden',7,31,1,1830,TRUE, 'Core', 31);
+        
+        //$url = COM_getCurrentURL();
+        $curdirectory = ltrim(ltrim(dirname($_SERVER['REQUEST_URI']), '\\'), '/');
+        $curfilename = basename($_SERVER['SCRIPT_NAME']);
+        
+        // URL parts of array returned are: plugin name, directory, filename, id
+        $url_lang = PLG_getLanguageURL();
+        
+        foreach ($url_lang as $value) {
+            $var = "";
+            // Found a matching directory and file
             if ($_CONF['url_rewrite']) {
-                if ($_CONF['url_routing']) {
-                    // url_routing = 1 - enabled with index.php
-                    // url_routing = 2 - enabled without index.php
-                    
-                    
-                    
-                    
-                    
+                if (empty($value[1])) {
+                    $checkdir = $value[2];
                 } else {
-                    // for "rewritten" URLs we assume that the first parameter after
-                    // [NG]the script name is the ID, e.g. /article.php/story-id-here_en
-                    // 2017 fix hiroron /index.php/topic/home_ja or /index.php?topic=home_ja
-                    $p = explode('/', $url);
-                    $parts = count($p);
-                    for ($i = 0; $i < $parts; $i++) {
-                        if (strrpos($p[$i], '.php') !== false) {
-                            for ($j = $i; $j < $parts; $j++) {
-                                if (isset($p[$j])) {
-                                    $l = strrpos($p[$j], '_');
-                                    if ($l !== false) {
-                                        $langId = substr($p[$j], $l + 1);
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        }
-                    }
+                    $checkdir = $value[1] . "/" . $value[2];
                 }
-            } else { // URL contains '?' or '&'
-                $url = explode('&', $url);
-                $urlpart = $url[0];
-                $l = strrpos($urlpart, '_');
-                if ($l !== false) {
-                    $langId = substr($urlpart, $l + 1);
+                
+                if ($curdirectory == $checkdir OR ($_CONF['url_routing'] AND ($curfilename == $checkdir))) {
+                    // Found a matching variable
+                    COM_setArgNames(array($value[3]));
+                    $var = COM_applyFilter(COM_getArgument($value[3]));                    
                 }
-            }            
-        } else {
-            // This is used mainly by the switch language block (after the visitor has been on the site already)
-            // The item also had a chance to update $_URL with the correct language since if this code is executed it has most likely been called after lib-common has been loaded
-            $langId = $_URL->getLanguage(); // If empty no language is assumed or item does not support multi-language
-        }
+            } else {
+                if ($curdirectory . "/" . $curfilename == $value[1] . "/" . $value[2]) {
+                    // Found a matching variable
+                    $var = Geeklog\Input::fRequest($value[3], '');
+                }
+            }
+            
+            if (!empty($var)) {
+                // Now lets see if language id
+                $l = strrpos($var, '_');
+                if ($l !== false) {
+                    $langId = substr($var, $l + 1);
+                    break;
+                }                        
+            }
+        } 
+
         if (!empty($langId)) {
             if (isset($_CONF['language_files']) && is_array($_CONF['language_files']) &&
                 array_key_exists($langId, $_CONF['language_files'])) {
-                $retval = $_CONF['language_files'][$langId];
+                $retval = array($_CONF['language_files'][$langId], $value[0], $var);
             }
         }        
     }
@@ -6920,8 +6918,9 @@ function phpblock_switch_language()
     $langId = COM_getLanguageId($lang);
     $newLang = '';
     $newLangId = '';
-    // Figure out if we need to include language
-    $itemId = $_URL->getId();
+    $langURLinfo = _getLanguageInfoFromURL();
+    $itemId = $langURLinfo[2];
+    $itemType = $langURLinfo[1];
 
     if (count($_CONF['languages']) === 2) {
         foreach ($_CONF['languages'] as $key => $value) {
@@ -6932,7 +6931,7 @@ function phpblock_switch_language()
             }
         }
 
-        $switchUrl = COM_buildURL($_CONF['site_url'] . '/switchlang.php?lang=' . $newLangId . '&itemid' . $itemId);
+        $switchUrl = COM_buildURL($_CONF['site_url'] . '/switchlang.php?lang=' . $newLangId . '&itemid' . $itemId . '&itemtype' . $itemType);
         $retval .= COM_createLink($newLang, $switchUrl);
     } else {
         $retval .= '<form name="change" action="' . $_CONF['site_url']
@@ -6941,7 +6940,9 @@ function phpblock_switch_language()
         $retval .= '<input type="hidden" name="oldlang" value="' . $langId
             . '"' . XHTML . '>' . LB;
         $retval .= '<input type="hidden" name="itemid" value="' . $itemId
-            . '"' . XHTML . '>' . LB;            
+            . '"' . XHTML . '>' . LB;
+        $retval .= '<input type="hidden" name="itemtype" value="' . $itemType
+            . '"' . XHTML . '>' . LB;             
 
         $retval .= '<select onchange="change.submit()" name="lang">';
         foreach ($_CONF['languages'] as $key => $value) {
diff --git a/public_html/staticpages/index.php b/public_html/staticpages/index.php
index 5d6655271..f55608096 100644
--- a/public_html/staticpages/index.php
+++ b/public_html/staticpages/index.php
@@ -55,16 +55,6 @@
 $display_mode = COM_applyFilter(COM_getArgument('disp_mode'));
 $query = Geeklog\Input::fRequest('query', '');
 
-// If user is allowed to switch languages
-if ($_CONF['allow_user_language'] == 1) {
-    // Let's figure out if page is for specific language
-    // If so let URL class know in case user changes language
-    $page_lang = COM_getLanguageIdForObject($page);
-    if (!empty($page) AND !empty($page_lang)) {
-        $_URL->setItemInfo($page, $page_lang);
-    }
-}
-
 TOPIC_getTopic('staticpages', $page);
 
 // from comments display refresh:
diff --git a/public_html/switchlang.php b/public_html/switchlang.php
index 2ac9c2d96..a57a6c9bc 100644
--- a/public_html/switchlang.php
+++ b/public_html/switchlang.php
@@ -42,21 +42,34 @@
 * @param    string  $oldLang    old, i.e. current language
 * @return   string              new URL after the language switch
 */
-function switch_language($url, $newLang, $oldLang, $itemId)
+function switch_language($url, $newLang, $oldLang, $itemId, $itemType)
 {
     global $_CONF, $_URL;
-
+    
     // See if we need to figure out new URL (ie is url language specific and are any variables missing)
-    if (empty($itemId) || empty($newLang) || empty($oldLang) || (strlen($newLang) !== strlen($oldLang))) {
+    if (empty($itemType) || empty($itemId) || empty($newLang) || empty($oldLang) || (strlen($newLang) !== strlen($oldLang))) {
         return $url;
     }
     
+    $retval = "";
+    
     // Technically we don't care about if normal url, rewrite url, or routed url as id will be the same
-    // Still not 100% perfect search solution as other variables in string may have the exact same id (though highely unlikely)
+    // Still not 100% perfect search solution as other variables in string may have the exact same id (though highly unlikely)
     $pos = strrpos($itemId, "_");
     if ($pos) {
         $newItemId = substr($itemId, 0, $pos) . '_' . $newLang;
-        $retval = str_replace($itemId, $newItemId, $url);
+        
+        if ($_CONF['switchlang_homepage']) {
+            // Figure out if new item exists or user has access
+            $newItemId = PLG_getItemInfo($itemType, $newItemId, 'id'); // if it does the id will be returned
+        }
+        
+        if (!(empty($newItemId))) {
+            $retval = str_replace($itemId, $newItemId, $url);
+        } else {
+            // Doesn't exist so homepage
+            $retval = $_CONF['site_url'] . '/';
+        }
     } else {
         // Something went wrong so just return original url
         $retval = $url;
@@ -80,6 +93,7 @@ function switch_language($url, $newLang, $oldLang, $itemId)
     $lang = preg_replace('/[^a-z0-9\-_]/', '', $lang);
     $oldLang = COM_getLanguageId();
     $itemId = Geeklog\Input::fRequest('itemid', '');
+    $itemType = Geeklog\Input::fRequest('itemtype', '');
     
     // do we really have a new language to switch to?
     if (!empty($lang) && array_key_exists($lang, $_CONF['language_files'])) {
@@ -104,7 +118,7 @@ function switch_language($url, $newLang, $oldLang, $itemId)
 
     // Change the language ID if needed
     if (!empty($ret_url) && !empty($lang) && !empty($oldLang)) {
-        $ret_url = switch_language($ret_url, $lang, $oldLang, $itemId);
+        $ret_url = switch_language($ret_url, $lang, $oldLang, $itemId, $itemType);
     }
 }
 
@@ -113,15 +127,4 @@ function switch_language($url, $newLang, $oldLang, $itemId)
     $ret_url = $_CONF['site_url'] . '/';
 }
 
-// **** ISSUE with switchlang
-// Article, Topics, and Staticpages (and maybe other third party plugins) support multiple languages
-// If a page is already in a specific language there may not be a page for it in the new language being switched too or the user could not have access to it
-// The problem is there currently is no easy way (with regular and rewritten urls) to determine if the last thing accessed was (article, topic, some plugin, admin page, whatever) or the id of it if there was one
-// If there was, then we could maybe use PLG_getItemInfo (which may need modifying to work with topics) to figure out access
-// Current fix is a setting in the config which allows the admin to have the switch language block to always redirect to the homepage
-if ($_CONF['switchlang_homepage']) {
-    $ret_url = $_CONF['site_url'] . '/';
-}
-
-
 header("Location: $ret_url");
diff --git a/system/classes/url.class.php b/system/classes/url.class.php
index be5769eb8..f8729e6fc 100644
--- a/system/classes/url.class.php
+++ b/system/classes/url.class.php
@@ -61,23 +61,6 @@ class Url
      * @var int
      */
     private $urlRouting;
-    
-
-    /**
-     * @var bool
-     */
-    private $itemSet = false;    
-    
-    /**
-     * @var string
-     */
-    private $itemId;
-    
-    /**
-     * @var string
-     */
-    private $itemLanguage;
-    
 
     /**
      * Constructor
@@ -255,51 +238,6 @@ private function getArguments()
             $this->arguments = array();
         }
     }
-    
-    /**
-     * Set Required Item info of url for multi-language support
-     * This only needs to be set for urls that point to an item that has an alternate language item
-     *
-     * @param  string $id       Id of item in url if exists
-     * @param  string $lang     Language of item in url if exists
-     */
-    public function setItemInfo($id, $lang)
-    {
-        $this->itemId = $id;
-        $this->itemLanguage = $lang;
-        $this->itemSet = true;
-    }
-    
-    /**
-     * Return language of item in url 
-     *
-     * @return string      language of url if exists
-     */
-    public function getLanguage()
-    {
-        return $this->itemLanguage;
-    }     
-
-    /**
-     * Return if Item has been set or not so we can deal with language issues
-     * if a specific language page is visited
-     *
-     * @return bool      if item information (id and lang) has already been set
-     */
-    public function ItemSet()
-    {
-        return $this->itemSet;
-    }  
-    
-    /**
-     * Return id of item in url. This way we don't have to find it
-     *
-     * @return string      id of url if exists
-     */
-    public function getId()
-    {
-        return $this->itemId;
-    }     
 
     /**
      * Return if URL rewrite feature is enabled
diff --git a/system/lib-plugins.php b/system/lib-plugins.php
index fd3f100df..caa48539c 100644
--- a/system/lib-plugins.php
+++ b/system/lib-plugins.php
@@ -2746,6 +2746,40 @@ function PLG_getIcon($type)
     return $retval;
 }
 
+/**
+ * Asks plugins to return what the url parts are for any that support mutli language items
+ *
+ * @return   array      Array of array of url parts needed to determine if a url has an item id in it that contains a language id
+ *                      URL parts of array include: plugin name, directory, filename, item id url variable name
+ */
+function PLG_getLanguageURL()
+{
+    global $_CONF, $_PLUGINS;
+    
+    // Don't use a plugin function or plugin config for this as plugins functions.inc is not loaded yet when COM_getLanguage is called in lib-common
+    // Instead grab from a hidden Core conf_values (which are loaded)
+    // See _getLanguageInfoFromURL in lib-common for a detailed explanation
+      
+    $retval = array();
+
+    // Add article and topic to enabled plugins
+    $pluginTypes = array_merge(array('article', 'topic'), $_PLUGINS);
+
+    foreach ($pluginTypes as $pi_name) {
+        $array_key = 'langurl_' . $pi_name;
+        if (array_key_exists($array_key, $_CONF)) {
+            if (is_array($_CONF[$array_key]) && (count($_CONF[$array_key]) > 0)) {
+                $langurl = $_CONF[$array_key];
+                array_unshift($langurl, $pi_name);
+                $retval[] = $langurl;
+            }
+        }
+    }
+    
+    return $retval;
+}
+
+
 /**
  * Invoke a service
  *
diff --git a/system/lib-topic.php b/system/lib-topic.php
index 3e45c3aba..f43dcf260 100644
--- a/system/lib-topic.php
+++ b/system/lib-topic.php
@@ -1817,3 +1817,139 @@ function plugin_user_changed_topic($uid)
     $cacheInstance = 'topic_tree__' . CACHE_security_hash();
     CACHE_remove_instance($cacheInstance);
 }
+
+/**
+ * Return information for a topic
+ *
+ * @param    string $tid   Topic ID or '*'
+ * @param    string $what    comma-separated list of properties
+ * @param    int    $uid     user ID or 0 = current user
+ * @param    array  $options (reserved for future extensions)
+ * @return   mixed               string or array of strings with the information
+ */
+function plugin_getiteminfo_topic($tid, $what, $uid = 0, $options = array())
+{
+    global $_CONF, $_TABLES;
+
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
+    foreach ($properties as $p) {
+        switch ($p) {
+            case 'description':
+            case 'excerpt':
+                $fields[] = 'meta_description';
+                break;
+
+            case 'id':
+                $fields[] = 'tid';
+                break;
+
+            case 'page_title':
+            case 'title':
+                $fields[] = 'topic';
+                break;
+
+            case 'url':
+                // needed for $tid == '*', but also in case we're only requesting
+                // the URL (so that $fields isn't empty)
+                $fields[] = 'id';
+                break;
+
+            default:
+                // nothing to do
+                break;
+        }
+    }
+
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
+    }
+
+    // prepare SQL request
+    $where = ' WHERE 1 ';
+    if ($tid != '*') {
+        $where .= " AND (tid = '" . DB_escapeString($tid) . "')";
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSQL('AND', $uid);
+    } else {
+        $permSql = COM_getPermSQL('AND');
+    }
+    $sql = "SELECT " . implode(',', $fields)
+        . " FROM {$_TABLES['topics']}" . $where . $permSql;
+    if ($tid != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+                case 'description':
+                case 'excerpt':
+                    $props[$p] = stripslashes($retval['meta_description']);
+                    break;
+
+                case 'id':
+                    $props['id'] = $A['tid'];
+                    break;
+
+                case 'page_title':
+                case 'title':
+                    $props[$p] = stripslashes($A['topic']);
+                    break;
+
+                case 'url':
+                    if (empty($A['tid'])) {
+                        $props['url'] = COM_buildURL($_CONF['site_url']
+                            . '/index.php?topic=' . $tid);
+                    } else {
+                        $props['url'] = COM_buildURL($_CONF['site_url']
+                            . '/index.php?topic=' . $A['tid']);
+                    }
+                    break;
+
+                default:
+                    // return empty string for unknown properties
+                    $props[$p] = '';
+                    break;
+            }
+        }
+
+        $mapped = array();
+        foreach ($props as $key => $value) {
+            if ($tid == '*') {
+                if ($value != '') {
+                    $mapped[$key] = $value;
+                }
+            } else {
+                $mapped[] = $value;
+            }
+        }
+
+        if ($tid == '*') {
+            $retval[] = $mapped;
+        } else {
+            $retval = $mapped;
+            break;
+        }
+    }
+
+    if (($tid != '*') && (count($retval) == 1)) {
+        $retval = $retval[0];
+    }
+
+    return $retval;
+}
+