diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c6cc797cc..10b9ec571 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -299,7 +299,7 @@ class LLInventoryRecentItemsPanel : public LLInventoryPanel
 public:
 	LLInventoryRecentItemsPanel(const std::string& name,
 								    const std::string& sort_order_setting,
-								    const std::string& start_folder,
+								    const LLSD& start_folder,
 									const LLRect& rect,
 									LLInventoryModel* inventory,
 									BOOL allow_multi_select,
@@ -332,7 +332,7 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 	if (node->getAttributeString("start_folder.type", start))
 		start_folder["type"] = start;
 
-	if(name == "Recent Items")
+	if (name == "Recent Items")
 		panel = new LLInventoryRecentItemsPanel(name, sort_order, start_folder,
 								 rect, &gInventory,
 								 allow_multi_select, parent);
@@ -1382,12 +1382,12 @@ static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER;
 
 LLInventoryRecentItemsPanel:: LLInventoryRecentItemsPanel(const std::string& name,
 						    		const std::string& sort_order_setting,
-									const std::string& start_folder,
+									const LLSD& start_folder,
 									const LLRect& rect,
 									LLInventoryModel* inventory,
 									BOOL allow_multi_select,
 									LLView *parent_view) :
-									LLInventoryPanel(name, sort_order_setting, start_folder,rect,inventory,allow_multi_select,parent_view)
+									LLInventoryPanel(name, sort_order_setting,start_folder,rect,inventory,allow_multi_select,parent_view)
 {
 	// replace bridge builder to have necessary View bridges.
 	mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;	
diff --git a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml
index 8d5fa265e..5a0b67c02 100644
--- a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_panel
-    label="ALL"
+    label="All"
     name="All Items"
     help_topic="marketplace_tab"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml
index 44f507ad8..64ac0262f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_panel
-    label="LISTED"
+    label="Listed"
     name="Active Items"
     help_topic="marketplace_tab"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml
index 871e8773c..21c3f351f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_panel
-    label="UNASSOCIATED"
+    label="Unassociated"
     name="Unassociated Items"
     help_topic="marketplace_tab"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml
index 98bef04aa..15ae6c48b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_panel
-    label="UNLISTED"
+    label="Unlisted"
     name="Inactive Items"
     help_topic="marketplace_tab"
     layout="topleft"