diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 2b2753dee7df4cff324930cd013c29ca0593d35e..379bc14e917d85393a3d244ac24c6fc18962f30e 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -194,7 +194,7 @@ bool RlvActions::canSendTypingStart()
 	// The CHAT_TYPE_START indicator can be sent if:
 	//   - nearby chat isn't being redirected
 	//   - the user specifically indicated that they want to show typing under @redirchat
-	return !RlvHandler::instance().hasBehaviour(RLV_BHVR_REDIRCHAT) || gSavedSettings.get<bool>(RLV_SETTING_SHOWREDIRECTCHATTYPING);
+	return !RlvHandler::instance().hasBehaviour(RLV_BHVR_REDIRCHAT) || gSavedSettings.get<bool>(RlvSettingNames::ShowRedirectChatTyping);
 }
 
 bool RlvActions::canStartIM(const LLUUID& idRecipient, bool fIgnoreOpen)
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 6b462d01df6c4e8e219a7f5e0df9d62d420df25f..369eb3334c4338e7fbda63e810b6c5da1e785bf4 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1871,9 +1871,9 @@ void RlvBehaviourToggleHandler<RLV_BHVR_BUY>::onCommandToggle(ERlvBehaviour eBhv
 	// Start or stop filtering opening the buy, buy contents and pay object floaters
 	if (fHasBhvr)
 	{
-		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object", std::string(RLV_STRING_BLOCKED_GENERIC)));
-		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object_contents", std::string(RLV_STRING_BLOCKED_GENERIC)));
-		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_object", std::string(RLV_STRING_BLOCKED_GENERIC)));
+		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object", RlvStringKeys::Blocked::Generic));
+		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object_contents", RlvStringKeys::Blocked::Generic));
+		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_object", RlvStringKeys::Blocked::Generic));
 	}
 	else
 	{
@@ -2032,7 +2032,7 @@ void RlvBehaviourToggleHandler<RLV_BHVR_PAY>::onCommandToggle(ERlvBehaviour eBhv
 	// Start or stop filtering opening the pay avatar floater
 	if (fHasBhvr)
 	{
-		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_resident"));
+		RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_resident", RlvStringKeys::Blocked::Generic));
 	}
 	else
 	{
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 62ddf89189c4e4d8e8ae2a4d305f76d2ecd8d4c5..ae6a4e358af11c55fe61be91d39c184ffb1c9cdc 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -279,7 +279,11 @@ void RlvUIEnabler::onUpdateLoginLastLocation(bool fQuitting)
 
 // ============================================================================
 
+#ifdef CATZNIP_STRINGVIEW
+bool RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName, const boost::string_view& strRlvNotification)
+#else
 bool RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName, const std::string& strRlvNotification)
+#endif // CATZNIP_STRINGVIEW
 {
 	return addGenericFloaterFilter(strFloaterName, [strRlvNotification]() { RlvUtil::notifyBlocked(strRlvNotification); });
 }
@@ -303,7 +307,7 @@ bool RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName, co
 bool RlvUIEnabler::removeGenericFloaterFilter(const std::string& strFloaterName)
 {
 	auto itFloater = m_FilteredFloaterMap.find(strFloaterName);
-	if (itFloater != m_FilteredFloaterMap.end())
+	if (m_FilteredFloaterMap.end() == itFloater)
 		return false;
 
 	m_FilteredFloaterMap.erase(itFloater);
diff --git a/indra/newview/rlvui.h b/indra/newview/rlvui.h
index c53a9ab190835bca18aad8a806dc860388238ffb..2040fe46549d222800fc71e5cde5d08c3629ca57 100644
--- a/indra/newview/rlvui.h
+++ b/indra/newview/rlvui.h
@@ -55,7 +55,11 @@ class RlvUIEnabler : public LLSingleton<RlvUIEnabler>
 	 * Floater and sidebar validation callbacks
 	 */
 public:
+#ifdef CATZNIP_STRINGVIEW
+	bool addGenericFloaterFilter(const std::string& strFloaterName, const boost::string_view& strRlvNotification);
+#else
 	bool addGenericFloaterFilter(const std::string& strFloaterName, const std::string& strRlvNotification);
+#endif // CATZNIP_STRINGVIEW
 	bool addGenericFloaterFilter(const std::string& strFloaterName, const std::function<void()>& fn = nullptr);
 	bool removeGenericFloaterFilter(const std::string& strFloaterName);