diff --git a/amazon_store.module b/amazon_store.module
index 5c670cd..f2c08e4 100644
--- a/amazon_store.module
+++ b/amazon_store.module
@@ -2106,3 +2106,25 @@ function amazon_store_format_attribute($attributeType, $attribute_value, $handle
   }
   return $output;
 }
+
+/**
+* Format and clean up a Browse Node name. 
+*
+* This is a good place to handle <a href="http://drupal.org/node/1172442" title="http://drupal.org/node/1172442" rel="nofollow">http://drupal.org/node/1172442</a> and
+* <a href="http://drupal.org/node/1172106" title="http://drupal.org/node/1172106" rel="nofollow">http://drupal.org/node/1172106</a> (Amazon API sometimes returns empty
+* Browse Node names).
+*
+* This function uses t() function in conjunction with the 'amazon_store_missing_browsenode_name_text'
+* variable.  All occurances of the symbol @id will be replaced with the Browse
+* Node Id.
+*
+* @param $id  The current Browse Node Id.
+* @param $name The name.
+* @return A 'cleaned up' name.
+*/
+function amazon_store_cleanup_browsenode_name($id, $name) {
+  if ($name == null || strlen($name)==0) {
+    $name = t(variable_get('amazon_store_missing_browsenode_name_text', t('Unknown Category')), array('@id'=>$id));
+  }
+  return $name;
+}
\ No newline at end of file
diff --git a/amazon_store_browsenodes_panel.tpl.php b/amazon_store_browsenodes_panel.tpl.php
index a6db9a8..cb98cab 100644
--- a/amazon_store_browsenodes_panel.tpl.php
+++ b/amazon_store_browsenodes_panel.tpl.php
@@ -13,10 +13,7 @@ if ($item->BrowseNodes->BrowseNode) {
     $item = $BrowseNode;
     $line = '';
     do {
-      $name = $item->Name;
-      if ($name == null || strlen($name)==0) {
-        $name = variable_get('amazon_store_missing_browsenode_name_text', t('Unknown Category'));
-      }
+      $name = amazon_store_cleanup_browsenode_name($item->BrowseNodeId, $item->Name);
       // If it has a paren in it, it's a consolidation node, and
       // not useful to end-user
       if (strstr($name, '(')) {