diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 255b1396c2..e38c25d85e 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -415,7 +415,10 @@ protected:
 protected:
     virtual std::string _getSearchText() const
     {
-        return getLabelUnselected() + getToolTip();
+        // <FS:PP> Look in name attributes, making search independent from localization
+        // return getLabelUnselected() + getToolTip();
+        return getLabelUnselected() + getToolTip() + getName();
+        // </FS:PP>
     }
 };
 
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 0cde54326f..4d138b6156 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -143,7 +143,10 @@ private:
 protected:
     virtual std::string _getSearchText() const
     {
-        return getLabel() + getToolTip();
+        // <FS:PP> Look in name attributes, making search independent from localization
+        // return getLabel() + getToolTip();
+        return getLabel() + getToolTip() + getName();
+        // </FS:PP>
     }
 
     virtual void onSetHighlight() const // When highlight, really do highlight the label
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index e8762de875..e7a378f8ff 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1120,7 +1120,10 @@ std::string LLComboBox::_getSearchText() const
             iter++;
         }
     }
-    return res + getToolTip();
+    // <FS:PP> Look in name attributes, making search independent from localization
+    // return res + getToolTip();
+    return res + getToolTip() + getName();
+    // </FS:PP>
 }
 
 //virtual
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
index 311377a61f..30b03c6e3d 100644
--- a/indra/llui/llsliderctrl.h
+++ b/indra/llui/llsliderctrl.h
@@ -140,7 +140,10 @@ protected:
         std::string strLabel;
         if( mLabelBox )
             strLabel = mLabelBox->getLabel();
-        return strLabel + getToolTip();
+        // <FS:PP> Look in name attributes, making search independent from localization
+        // return strLabel + getToolTip();
+        return strLabel + getToolTip() + getName();
+        // </FS:PP>
     }
     virtual void onSetHighlight() const  // When highlight, really do highlight the label
     {
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 40e19ec4bd..8e858823b8 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -703,7 +703,10 @@ protected:
     // virtual
     std::string _getSearchText() const override
     {
-        return mLabel.getString() + getToolTip();
+        // <FS:PP> Look in name attributes, making search independent from localization
+        // return mLabel.getString() + getToolTip();
+        return mLabel.getString() + getToolTip() + getName();
+        // </FS:PP>
     }
 
     std::vector<LLRect> getSelectionRects();
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 8288849701..f6e682dd5e 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -488,7 +488,7 @@ bool LLStatusBar::postBuild()
     // <FS:Beq> Make FPS a clickable button with contextual colour
     // mFPSText = getChild<LLButton>("FPSText");
     mFPSText = getChild<LLTextBox>("FPSText");
-    mFPSText->setClickedCallback(std::bind(&LLUrlAction::executeSLURL, "secondlife:///app/openfloater/preferences?search=limit%20framerate", true));
+    mFPSText->setClickedCallback(std::bind(&LLUrlAction::executeSLURL, "secondlife:///app/openfloater/preferences?search=limitframerate", true));
     // </FS:Beq>
     mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft;