diff --git a/e107_plugins/tagwords/languages/English.php b/e107_plugins/tagwords/languages/English.php
index 3f1312bc5..eb614708b 100644
--- a/e107_plugins/tagwords/languages/English.php
+++ b/e107_plugins/tagwords/languages/English.php
@@ -65,4 +65,7 @@ define("LAN_TAG_MENU_2", "Tagwords");
 
 define("LAN_TAG_CORE_NEWS_1", "News");
 define("LAN_TAG_CORE_CPAGES_1", "Pages");
-?>
\ No newline at end of file
+
+define("LAN_TAG_URL_NAME", "Tagwords");
+define("LAN_TAG_URL_DEFAULT_LABEL", "Default");
+define("LAN_TAG_URL_DEFAULT_DESCR", "Example: http://yoursite.com/tagwords/some-tag");
\ No newline at end of file
diff --git a/e107_plugins/tagwords/tagwords_shortcodes.php b/e107_plugins/tagwords/tagwords_shortcodes.php
index 711f9f55b..d9caa266f 100644
--- a/e107_plugins/tagwords/tagwords_shortcodes.php
+++ b/e107_plugins/tagwords/tagwords_shortcodes.php
@@ -251,7 +251,7 @@ class tagwords_shortcodes
 					{
 						$name = "e_tagwords_{$area}";
 						$selected = (varsettrue($_GET['area'])==$area ? "selected=selected" : '');
-						$text .= "<option value='".$area."' ".$selected." >".$tag->$name->settings['caption']."</option>";
+						$text .= "<option value='".$area."' ".$selected." >".defset($tag->$name->settings['caption'], $tag->$name->settings['caption'])."</option>";
 					}
 				}
 			$text .= "
@@ -401,9 +401,9 @@ class tagwords_shortcodes
 			$name = "e_tagwords_{$area}";
 
 			$text .= "
-			<label for='".$id."[".$area."]'>
-			<input type='checkbox' name='".$id."[".$area."]' id='".$id."[".$area."]' value='1' ".$sel." />
-			".$tag->$name->settings['caption']."
+			<label for='".$id."-".$area."'>
+			<input type='checkbox' name='".$id."[".$area."]' id='".$id."-".$area."' value='1' ".$sel." />
+			".defset($tag->$name->settings['caption'], $tag->$name->settings['caption'])."
 			</label><br />";
 
 		}
diff --git a/e107_plugins/tagwords/url/url.php b/e107_plugins/tagwords/url/url.php
index 85562e598..7e1f4718f 100644
--- a/e107_plugins/tagwords/url/url.php
+++ b/e107_plugins/tagwords/url/url.php
@@ -40,12 +40,13 @@ class plugin_tagwords_url extends eUrlConfig
 	public function admin()
 	{
 		// static may be used for performance
-		e107::plugLan('pm', 'url', true);
+		e107::plugLan('tagwords');
+		
 		static $admin = array(
 			'labels' => array(
-				'name' => TAGW_LAN_URL_NAME, // Module name
-				'label' => TAGW_LAN_URL_DEFAULT_LABEL, // Current profile name
-				'description' => TAGW_LAN_URL_DEFAULT_DESCR, //
+				'name' => LAN_TAG_URL_NAME, // Module name
+				'label' => LAN_TAG_URL_DEFAULT_LABEL, // Current profile name
+				'description' => LAN_TAG_URL_DEFAULT_DESCR, //
 			),
 			'form' => array(), // Under construction - additional configuration options
 			'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity