diff --git a/.env.defaults b/.env.defaults
index bfeb12fff..5274f8c68 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -19,7 +19,7 @@ THUMBNAIL_CDN_URL=https://image-processor.vanwanet.com/optimize/
 WELCOME_VERSION=1.0
 
 # STRIPE
-STRIPE_PUBLIC_KEY='pk_test_NoL1JWL7i1ipfhVId5KfDZgo'
+# STRIPE_PUBLIC_KEY='pk_test_NoL1JWL7i1ipfhVId5KfDZgo'
 
 # Analytics
 MATOMO_URL=https://analytics.lbry.com/
diff --git a/flow-typed/search.js b/flow-typed/search.js
index b795f9c12..adfb768f6 100644
--- a/flow-typed/search.js
+++ b/flow-typed/search.js
@@ -28,7 +28,7 @@ declare type SearchOptions = {
 
 declare type SearchState = {
   options: SearchOptions,
-  resultsByQuery: {},
+  urisByQuery: {},
   hasReachedMaxResultsLength: {},
   searching: boolean,
 };
@@ -40,7 +40,6 @@ declare type SearchSuccess = {
     from: number,
     size: number,
     uris: Array<string>,
-    recsys: string,
   },
 };
 
diff --git a/static/app-strings.json b/static/app-strings.json
index e5f45808b..a7e83a936 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2090,5 +2090,8 @@
   "Expand Comments": "Expand Comments",
   "Expand": "Expand",
   "Load More": "Load More",
+  "Collection": "Collection",
+  "%channelName% isn't live right now, but the chat is! Check back later to watch the stream.": "%channelName% isn't live right now, but the chat is! Check back later to watch the stream.",
+  "Review": "Review",
   "--end--": "--end--"
 }
diff --git a/ui/component/channelContent/view.jsx b/ui/component/channelContent/view.jsx
index c069428a5..3498e5799 100644
--- a/ui/component/channelContent/view.jsx
+++ b/ui/component/channelContent/view.jsx
@@ -81,7 +81,7 @@ function ChannelContent(props: Props) {
               !showMature ? '&nsfw=false&size=50&from=0' : ''
             }`
           )
-          .then(({ body: results }) => {
+          .then((results) => {
             const urls = results.map(({ name, claimId }) => {
               return `lbry://${name}#${claimId}`;
             });
diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index 008a28aa1..63e77a026 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import type { ElementRef } from 'react';
-import { SIMPLE_SITE, STRIPE_PUBLIC_KEY } from 'config';
+import { SIMPLE_SITE } from 'config';
 import * as PAGES from 'constants/pages';
 import * as ICONS from 'constants/icons';
 import React from 'react';
@@ -21,12 +21,8 @@ import Empty from 'component/common/empty';
 import { getChannelIdFromClaim } from 'util/claim';
 import { Lbryio } from 'lbryinc';
 
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 const TAB_FIAT = 'TabFiat';
 const TAB_LBC = 'TabLBC';
@@ -245,10 +241,13 @@ export function CommentCreate(props: Props) {
           }, 1500);
 
           doToast({
-            message: __("You sent %tipAmount% LBRY Credits as a tip to %tipChannelName%, I'm sure they appreciate it!", {
-              tipAmount: tipAmount, // force show decimal places
-              tipChannelName,
-            }),
+            message: __(
+              "You sent %tipAmount% LBRY Credits as a tip to %tipChannelName%, I'm sure they appreciate it!",
+              {
+                tipAmount: tipAmount, // force show decimal places
+                tipChannelName,
+              }
+            ),
           });
 
           setSuccessTip({ txid, tipAmount });
@@ -265,7 +264,8 @@ export function CommentCreate(props: Props) {
       Lbryio.call(
         'customer',
         'tip',
-        { // round to deal with floating point precision
+        {
+          // round to deal with floating point precision
           amount: Math.round(100 * roundedAmount), // convert from dollars to cents
           creator_channel_name: tipChannelName, // creator_channel_name
           creator_channel_claim_id: channelClaimId,
@@ -387,12 +387,7 @@ export function CommentCreate(props: Props) {
           }
         }}
       >
-        <FormField
-          type="textarea"
-          name={'comment_signup_prompt'}
-          placeholder={__('Say something about this...')}
-          label={isFetchingChannels ? __('Comment') : undefined}
-        />
+        <FormField type="textarea" name={'comment_signup_prompt'} placeholder={__('Say something about this...')} />
         <div className="section__actions--no-margin">
           <Button disabled button="primary" label={__('Post --[button to submit something]--')} requiresAuth={IS_WEB} />
         </div>
@@ -534,7 +529,8 @@ export function CommentCreate(props: Props) {
                 }}
               />
             )}
-            {!claimIsMine && (
+            {/* @if TARGET='web' */}
+            {!claimIsMine && stripeEnvironment && (
               <Button
                 disabled={disabled}
                 button="alt"
@@ -546,6 +542,7 @@ export function CommentCreate(props: Props) {
                 }}
               />
             )}
+            {/* @endif */}
             {isReply && !minTip && (
               <Button
                 button="link"
diff --git a/ui/component/commentsList/index.js b/ui/component/commentsList/index.js
index e56b6ca6d..5d54af205 100644
--- a/ui/component/commentsList/index.js
+++ b/ui/component/commentsList/index.js
@@ -15,7 +15,6 @@ import {
   selectMyReactionsByCommentId,
   makeSelectCommentIdsForUri,
   selectSettingsByChannelId,
-  makeSelectPinnedCommentsForUri,
 } from 'redux/selectors/comments';
 import { doCommentReset, doCommentList, doCommentById, doCommentReactList } from 'redux/actions/comments';
 import { selectActiveChannelClaim } from 'redux/selectors/app';
@@ -26,7 +25,6 @@ const select = (state, props) => {
   return {
     myChannels: selectMyChannelClaims(state),
     allCommentIds: makeSelectCommentIdsForUri(props.uri)(state),
-    pinnedComments: makeSelectPinnedCommentsForUri(props.uri)(state),
     topLevelComments: makeSelectTopLevelCommentsForUri(props.uri)(state),
     topLevelTotalPages: makeSelectTopLevelTotalPagesForUri(props.uri)(state),
     totalComments: makeSelectTotalCommentsCountForUri(props.uri)(state),
diff --git a/ui/component/commentsList/view.jsx b/ui/component/commentsList/view.jsx
index ae3ee5b12..6e750bd3d 100644
--- a/ui/component/commentsList/view.jsx
+++ b/ui/component/commentsList/view.jsx
@@ -28,7 +28,6 @@ function scaleToDevicePixelRatio(value) {
 
 type Props = {
   allCommentIds: any,
-  pinnedComments: Array<Comment>,
   topLevelComments: Array<Comment>,
   topLevelTotalPages: number,
   fetchTopLevelComments: (string, number, number, number) => void,
@@ -58,7 +57,6 @@ function CommentList(props: Props) {
     fetchReacts,
     resetComments,
     uri,
-    pinnedComments,
     topLevelComments,
     topLevelTotalPages,
     claim,
@@ -113,34 +111,6 @@ function CommentList(props: Props) {
     }
   }
 
-  function getCommentElems(comments) {
-    return comments.map((comment) => {
-      return (
-        <CommentView
-          isTopLevel
-          threadDepth={3}
-          key={comment.comment_id}
-          uri={uri}
-          authorUri={comment.channel_url}
-          author={comment.channel_name}
-          claimId={comment.claim_id}
-          commentId={comment.comment_id}
-          message={comment.comment}
-          timePosted={comment.timestamp * 1000}
-          claimIsMine={claimIsMine}
-          commentIsMine={comment.channel_id && isMyComment(comment.channel_id)}
-          linkedCommentId={linkedCommentId}
-          isPinned={comment.is_pinned}
-          supportAmount={comment.support_amount}
-          numDirectReplies={comment.replies}
-          isModerator={comment.is_moderator}
-          isGlobalMod={comment.is_global_mod}
-          isFiat={comment.is_fiat}
-        />
-      );
-    });
-  }
-
   // Reset comments
   useEffect(() => {
     if (page === 0) {
@@ -253,6 +223,8 @@ function CommentList(props: Props) {
     topLevelTotalPages,
   ]);
 
+  const displayedComments = readyToDisplayComments ? topLevelComments : [];
+
   return (
     <Card
       title={
@@ -323,8 +295,33 @@ function CommentList(props: Props) {
             })}
             ref={commentRef}
           >
-            {readyToDisplayComments && pinnedComments && getCommentElems(pinnedComments)}
-            {readyToDisplayComments && topLevelComments && getCommentElems(topLevelComments)}
+            {topLevelComments &&
+              displayedComments &&
+              displayedComments.map((comment) => {
+                return (
+                  <CommentView
+                    isTopLevel
+                    threadDepth={3}
+                    key={comment.comment_id}
+                    uri={uri}
+                    authorUri={comment.channel_url}
+                    author={comment.channel_name}
+                    claimId={comment.claim_id}
+                    commentId={comment.comment_id}
+                    message={comment.comment}
+                    timePosted={comment.timestamp * 1000}
+                    claimIsMine={claimIsMine}
+                    commentIsMine={comment.channel_id && isMyComment(comment.channel_id)}
+                    linkedCommentId={linkedCommentId}
+                    isPinned={comment.is_pinned}
+                    supportAmount={comment.support_amount}
+                    numDirectReplies={comment.replies}
+                    isModerator={comment.is_moderator}
+                    isGlobalMod={comment.is_global_mod}
+                    isFiat={comment.is_fiat}
+                  />
+                );
+              })}
           </ul>
 
           {isMobile && (
diff --git a/ui/component/livestreamComments/index.js b/ui/component/livestreamComments/index.js
index 10ee56c06..97cac2e75 100644
--- a/ui/component/livestreamComments/index.js
+++ b/ui/component/livestreamComments/index.js
@@ -3,22 +3,22 @@ import { makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
 import { doCommentSocketConnect, doCommentSocketDisconnect } from 'redux/actions/websocket';
 import { doCommentList, doSuperChatList } from 'redux/actions/comments';
 import {
+  selectPinnedCommentsById,
   makeSelectTopLevelCommentsForUri,
   selectIsFetchingComments,
   makeSelectSuperChatsForUri,
   makeSelectSuperChatTotalAmountForUri,
-  makeSelectPinnedCommentsForUri,
 } from 'redux/selectors/comments';
 import LivestreamComments from './view';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
   comments: makeSelectTopLevelCommentsForUri(props.uri)(state).slice(0, 75),
-  pinnedComments: makeSelectPinnedCommentsForUri(props.uri)(state),
   fetchingComments: selectIsFetchingComments(state),
   superChats: makeSelectSuperChatsForUri(props.uri)(state),
   superChatsTotalAmount: makeSelectSuperChatTotalAmountForUri(props.uri)(state),
   myChannels: selectMyChannelClaims(state),
+  pinnedCommentsById: selectPinnedCommentsById(state),
 });
 
 export default connect(select, {
diff --git a/ui/component/livestreamComments/view.jsx b/ui/component/livestreamComments/view.jsx
index b434592f3..a6f9e6c91 100644
--- a/ui/component/livestreamComments/view.jsx
+++ b/ui/component/livestreamComments/view.jsx
@@ -19,11 +19,11 @@ type Props = {
   doCommentSocketDisconnect: (string) => void,
   doCommentList: (string, string, number, number) => void,
   comments: Array<Comment>,
-  pinnedComments: Array<Comment>,
   fetchingComments: boolean,
   doSuperChatList: (string) => void,
   superChats: Array<Comment>,
   myChannels: ?Array<ChannelClaim>,
+  pinnedCommentsById: { [claimId: string]: Array<string> },
 };
 
 const VIEW_MODE_CHAT = 'view_chat';
@@ -38,12 +38,12 @@ export default function LivestreamComments(props: Props) {
     doCommentSocketConnect,
     doCommentSocketDisconnect,
     comments: commentsByChronologicalOrder,
-    pinnedComments,
     doCommentList,
     fetchingComments,
     doSuperChatList,
     myChannels,
     superChats: superChatsByTipAmount,
+    pinnedCommentsById,
   } = props;
 
   let superChatsFiatAmount, superChatsTotalAmount;
@@ -57,7 +57,11 @@ export default function LivestreamComments(props: Props) {
 
   const discussionElement = document.querySelector('.livestream__comments');
 
-  const pinnedComment = pinnedComments.length > 0 ? pinnedComments[0] : null;
+  let pinnedComment;
+  const pinnedCommentIds = (claimId && pinnedCommentsById[claimId]) || [];
+  if (pinnedCommentIds.length > 0) {
+    pinnedComment = commentsByChronologicalOrder.find((c) => c.comment_id === pinnedCommentIds[0]);
+  }
 
   function restoreScrollPos() {
     if (discussionElement) {
diff --git a/ui/component/viewers/videoViewer/internal/plugins/videojs-recsys/plugin.js b/ui/component/viewers/videoViewer/internal/plugins/videojs-recsys/plugin.js
index 01fd9a117..5ee3f3c8d 100644
--- a/ui/component/viewers/videoViewer/internal/plugins/videojs-recsys/plugin.js
+++ b/ui/component/viewers/videoViewer/internal/plugins/videojs-recsys/plugin.js
@@ -6,7 +6,6 @@ import {
   makeSelectRecommendedClaimIds,
   makeSelectRecommendationClicks,
 } from 'redux/selectors/content';
-import { makeSelectRecommendedRecsysIdForClaimId } from 'redux/selectors/search';
 
 const VERSION = '0.0.1';
 
@@ -37,7 +36,7 @@ function createRecsys(claimId, userId, events, loadedAt, isEmbed) {
       claimId: claimId,
       pageLoadedAt: pageLoadedAt,
       pageExitedAt: pageExitedAt,
-      recsysId: makeSelectRecommendedRecsysIdForClaimId(claimId)(state) || recsysId,
+      recsysId: recsysId,
       recClaimIds: makeSelectRecommendedClaimIds(claimId)(state),
       recClickedVideoIdx: makeSelectRecommendationClicks(claimId)(state),
       events: events,
diff --git a/ui/component/walletFiatPaymentHistory/view.jsx b/ui/component/walletFiatPaymentHistory/view.jsx
index 42d0341f3..45d55bde7 100644
--- a/ui/component/walletFiatPaymentHistory/view.jsx
+++ b/ui/component/walletFiatPaymentHistory/view.jsx
@@ -4,14 +4,8 @@ import Button from 'component/button';
 import Card from 'component/common/card';
 import { Lbryio } from 'lbryinc';
 import moment from 'moment';
-import { STRIPE_PUBLIC_KEY } from 'config';
-
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 type Props = {
   accountDetails: any,
@@ -41,12 +35,15 @@ const WalletBalance = (props: Props) => {
 
   // TODO: this is actually incorrect, last4 should be populated based on the transaction not the current customer details
   React.useEffect(() => {
-    (async function() {
-        const customerStatusResponse = await getCustomerStatus();
+    (async function () {
+      const customerStatusResponse = await getCustomerStatus();
 
-        const lastFour = customerStatusResponse.PaymentMethods && customerStatusResponse.PaymentMethods.length && customerStatusResponse.PaymentMethods[0].card.last4;
+      const lastFour =
+        customerStatusResponse.PaymentMethods &&
+        customerStatusResponse.PaymentMethods.length &&
+        customerStatusResponse.PaymentMethods[0].card.last4;
 
-        setLastFour(lastFour);
+      setLastFour(lastFour);
     })();
   }, []);
 
@@ -59,53 +56,57 @@ const WalletBalance = (props: Props) => {
             <div className="table__wrapper">
               <table className="table table--transactions">
                 <thead>
-                <tr>
-                  <th className="date-header">{__('Date')}</th>
-                  <th>{<>{__('Receiving Channel Name')}</>}</th>
-                  <th>{__('Tip Location')}</th>
-                  <th>{__('Amount (USD)')} </th>
-                  <th>{__('Card Last 4')}</th>
-                  <th>{__('Anonymous')}</th>
-                </tr>
+                  <tr>
+                    <th className="date-header">{__('Date')}</th>
+                    <th>{<>{__('Receiving Channel Name')}</>}</th>
+                    <th>{__('Tip Location')}</th>
+                    <th>{__('Amount (USD)')} </th>
+                    <th>{__('Card Last 4')}</th>
+                    <th>{__('Anonymous')}</th>
+                  </tr>
                 </thead>
                 <tbody>
-                {accountTransactions &&
-                accountTransactions.map((transaction) => (
-                  <tr key={transaction.name + transaction.created_at}>
-                    <td>{moment(transaction.created_at).format('LLL')}</td>
-                    <td>
-                      <Button
-                        className=""
-                        navigate={'/' + transaction.channel_name + ':' + transaction.channel_claim_id}
-                        label={transaction.channel_name}
-                        button="link"
-                      />
-                    </td>
-                    <td>
-                      <Button
-                        className=""
-                        navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
-                        label={
-                          transaction.channel_claim_id === transaction.source_claim_id
-                            ? 'Channel Page'
-                            : 'Content Page'
-                        }
-                        button="link"
-                      />
-                    </td>
-                    <td>${transaction.tipped_amount / 100}</td>
-                    <td>{lastFour}</td>
-                    <td>{transaction.private_tip ? 'Yes' : 'No'}</td>
-                  </tr>
-                ))}
+                  {accountTransactions &&
+                    accountTransactions.map((transaction) => (
+                      <tr key={transaction.name + transaction.created_at}>
+                        <td>{moment(transaction.created_at).format('LLL')}</td>
+                        <td>
+                          <Button
+                            className=""
+                            navigate={'/' + transaction.channel_name + ':' + transaction.channel_claim_id}
+                            label={transaction.channel_name}
+                            button="link"
+                          />
+                        </td>
+                        <td>
+                          <Button
+                            className=""
+                            navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
+                            label={
+                              transaction.channel_claim_id === transaction.source_claim_id
+                                ? 'Channel Page'
+                                : 'Content Page'
+                            }
+                            button="link"
+                          />
+                        </td>
+                        <td>${transaction.tipped_amount / 100}</td>
+                        <td>{lastFour}</td>
+                        <td>{transaction.private_tip ? 'Yes' : 'No'}</td>
+                      </tr>
+                    ))}
                 </tbody>
               </table>
-              {(!accountTransactions || accountTransactions.length === 0) && <p style={{textAlign: 'center', marginTop: '20px', fontSize: '13px', color: 'rgb(171, 171, 171)'}}>No Transactions</p>}
+              {(!accountTransactions || accountTransactions.length === 0) && (
+                <p style={{ textAlign: 'center', marginTop: '20px', fontSize: '13px', color: 'rgb(171, 171, 171)' }}>
+                  No Transactions
+                </p>
+              )}
             </div>
           </>
         }
       />
-  </>
+    </>
   );
 };
 
diff --git a/ui/component/walletSendTip/view.jsx b/ui/component/walletSendTip/view.jsx
index c88d3dd7a..2167f2e62 100644
--- a/ui/component/walletSendTip/view.jsx
+++ b/ui/component/walletSendTip/view.jsx
@@ -15,14 +15,8 @@ import LbcSymbol from 'component/common/lbc-symbol';
 import { parseURI } from 'lbry-redux';
 import usePersistedState from 'effects/use-persisted-state';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
-import { STRIPE_PUBLIC_KEY } from 'config';
-
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 const DEFAULT_TIP_AMOUNTS = [1, 5, 25, 100];
 const MINIMUM_FIAT_TIP = 1;
@@ -100,7 +94,7 @@ function WalletSendTip(props: Props) {
 
   // check if creator has a payment method saved
   React.useEffect(() => {
-    if (channelClaimId && isAuthenticated) {
+    if (channelClaimId && isAuthenticated && stripeEnvironment) {
       Lbryio.call(
         'customer',
         'status',
@@ -118,16 +112,18 @@ function WalletSendTip(props: Props) {
         setHasSavedCard(Boolean(defaultPaymentMethodId));
       });
     }
-  }, [channelClaimId, isAuthenticated]);
+  }, [channelClaimId, isAuthenticated, stripeEnvironment]);
 
   // check if creator has an account saved
   React.useEffect(() => {
     const tipInputElement = document.getElementById('tip-input');
-    if (tipInputElement) { tipInputElement.focus() }
+    if (tipInputElement) {
+      tipInputElement.focus();
+    }
   }, []);
 
   React.useEffect(() => {
-    if (channelClaimId) {
+    if (channelClaimId && stripeEnvironment) {
       Lbryio.call(
         'account',
         'check',
@@ -149,14 +145,14 @@ function WalletSendTip(props: Props) {
           // console.log(error);
         });
     }
-  }, [channelClaimId]);
+  }, [channelClaimId, stripeEnvironment]);
 
   const noBalance = balance === 0;
   const tipAmount = useCustomTip ? customTipAmount : presetTipAmount;
 
   const [activeTab, setActiveTab] = React.useState(claimIsMine ? TAB_BOOST : TAB_LBC);
 
-  function setClaimTypeText() {
+  function getClaimTypeText() {
     if (claim.value_type === 'stream') {
       return __('Content');
     } else if (claim.value_type === 'channel') {
@@ -169,22 +165,24 @@ function WalletSendTip(props: Props) {
       return __('Claim');
     }
   }
-  const claimTypeText = setClaimTypeText();
+  const claimTypeText = getClaimTypeText();
 
   let iconToUse;
   let explainerText = '';
   if (activeTab === TAB_BOOST) {
     iconToUse = ICONS.LBC;
-    explainerText = __('This refundable boost will improve the discoverability of this %claimTypeText% while active.', {claimTypeText});
+    explainerText = __('This refundable boost will improve the discoverability of this %claimTypeText% while active.', {
+      claimTypeText,
+    });
   } else if (activeTab === TAB_FIAT) {
     iconToUse = ICONS.FINANCE;
-    explainerText = __('Show this channel your appreciation by sending a donation in USD. ');
+    explainerText = __('Show this channel your appreciation by sending a donation in USD.');
     // if (!hasCardSaved) {
     //   explainerText += __('You must add a card to use this functionality.');
     // }
   } else if (activeTab === TAB_LBC) {
     iconToUse = ICONS.LBC;
-    explainerText = __('Show this channel your appreciation by sending a donation of Credits. ');
+    explainerText = __('Show this channel your appreciation by sending a donation of Credits.');
   }
 
   const isSupport = claimIsMine || activeTab === TAB_BOOST;
@@ -216,7 +214,7 @@ function WalletSendTip(props: Props) {
       } else if (tipAmount < MINIMUM_PUBLISH_BID) {
         tipError = __('Amount must be higher');
       }
-    //  if tip fiat tab
+      //  if tip fiat tab
     } else {
       regexp = RegExp(/^(\d*([.]\d{0,2})?)$/);
       const validTipInput = regexp.test(String(tipAmount));
@@ -276,7 +274,8 @@ function WalletSendTip(props: Props) {
           Lbryio.call(
             'customer',
             'tip',
-            { // round to fix issues with floating point numbers
+            {
+              // round to fix issues with floating point numbers
               amount: Math.round(100 * tipAmount), // convert from dollars to cents
               creator_channel_name: tipChannelName, // creator_channel_name
               creator_channel_claim_id: channelClaimId,
@@ -297,7 +296,7 @@ function WalletSendTip(props: Props) {
                 }),
               });
             })
-            .catch(function(error) {
+            .catch(function (error) {
               let displayError = 'Sorry, there was an error in processing your payment!';
 
               if (error.message !== 'payment intent failed to confirm') {
@@ -316,10 +315,10 @@ function WalletSendTip(props: Props) {
     }
   }
 
-  const countDecimals = function(value) {
+  const countDecimals = function (value) {
     const text = value.toString();
     const index = text.indexOf('.');
-    return (text.length - index - 1);
+    return text.length - index - 1;
   };
 
   function handleCustomPriceChange(event: SyntheticInputEvent<*>) {
@@ -387,7 +386,9 @@ function WalletSendTip(props: Props) {
     const displayAmount = !isNan(tipAmount) ? amountToShow : '';
 
     if (activeTab === TAB_BOOST) {
-      return (claimIsMine ?  __('Boost Your %claimTypeText%', {claimTypeText}) : __('Boost This %claimTypeText%', {claimTypeText}));
+      return claimIsMine
+        ? __('Boost Your %claimTypeText%', { claimTypeText })
+        : __('Boost This %claimTypeText%', { claimTypeText });
     } else if (activeTab === TAB_FIAT) {
       return __('Send a $%displayAmount% Tip', { displayAmount });
     } else if (activeTab === TAB_LBC) {
@@ -416,7 +417,16 @@ function WalletSendTip(props: Props) {
       {/* if there is no LBC balance, show user frontend to get credits */}
       {/* if there is lbc, the main tip/boost gui with the 3 tabs at the top */}
       <Card
-        title={<LbcSymbol postfix={claimIsMine ? __('Boost Your %claimTypeText%', {claimTypeText}) : __('Support This %claimTypeText%', {claimTypeText})} size={22} />}
+        title={
+          <LbcSymbol
+            postfix={
+              claimIsMine
+                ? __('Boost Your %claimTypeText%', { claimTypeText })
+                : __('Support This %claimTypeText%', { claimTypeText })
+            }
+            size={22}
+          />
+        }
         subtitle={
           <React.Fragment>
             {!claimIsMine && (
@@ -429,7 +439,9 @@ function WalletSendTip(props: Props) {
                   button="alt"
                   onClick={() => {
                     const tipInputElement = document.getElementById('tip-input');
-                    if (tipInputElement) { tipInputElement.focus() }
+                    if (tipInputElement) {
+                      tipInputElement.focus();
+                    }
                     if (!isConfirming) {
                       setActiveTab(TAB_LBC);
                     }
@@ -438,20 +450,24 @@ function WalletSendTip(props: Props) {
                 />
                 {/* tip fiat tab button */}
                 {/* @if TARGET='web' */}
-                <Button
-                  key="tip-fiat"
-                  icon={ICONS.FINANCE}
-                  label={__('Tip')}
-                  button="alt"
-                  onClick={() => {
-                    const tipInputElement = document.getElementById('tip-input');
-                    if (tipInputElement) { tipInputElement.focus() }
-                    if (!isConfirming) {
-                      setActiveTab(TAB_FIAT);
-                    }
-                  }}
-                  className={classnames('button-toggle', { 'button-toggle--active': activeTab === TAB_FIAT })}
-                />
+                {stripeEnvironment && (
+                  <Button
+                    key="tip-fiat"
+                    icon={ICONS.FINANCE}
+                    label={__('Tip')}
+                    button="alt"
+                    onClick={() => {
+                      const tipInputElement = document.getElementById('tip-input');
+                      if (tipInputElement) {
+                        tipInputElement.focus();
+                      }
+                      if (!isConfirming) {
+                        setActiveTab(TAB_FIAT);
+                      }
+                    }}
+                    className={classnames('button-toggle', { 'button-toggle--active': activeTab === TAB_FIAT })}
+                  />
+                )}
                 {/* @endif */}
                 {/* tip LBC tab button */}
                 <Button
@@ -461,7 +477,9 @@ function WalletSendTip(props: Props) {
                   button="alt"
                   onClick={() => {
                     const tipInputElement = document.getElementById('tip-input');
-                    if (tipInputElement) { tipInputElement.focus() }
+                    if (tipInputElement) {
+                      tipInputElement.focus();
+                    }
                     if (!isConfirming) {
                       setActiveTab(TAB_BOOST);
                     }
@@ -493,33 +511,29 @@ function WalletSendTip(props: Props) {
                   </div>
                   <div className="confirm__label">{setConfirmLabel()}</div>
                   <div className="confirm__value">
-                    {activeTab === TAB_FIAT ? <p>$ {(Math.round(tipAmount * 100) / 100).toFixed(2)}</p> : <LbcSymbol postfix={tipAmount} size={22} />}
+                    {activeTab === TAB_FIAT ? (
+                      <p>$ {(Math.round(tipAmount * 100) / 100).toFixed(2)}</p>
+                    ) : (
+                      <LbcSymbol postfix={tipAmount} size={22} />
+                    )}
                   </div>
                 </div>
               </div>
               <div className="section__actions">
-                <Button
-                  autoFocus
-                  onClick={handleSubmit}
-                  button="primary"
-                  disabled={isPending}
-                  label={__('Confirm')}
-                />
+                <Button autoFocus onClick={handleSubmit} button="primary" disabled={isPending} label={__('Confirm')} />
                 <Button button="link" label={__('Cancel')} onClick={() => setIsConfirming(false)} />
               </div>
             </>
-            // only show the prompt to earn more if its lbc or boost tab and no balance
-            // otherwise you can show the full prompt
-          ) : (!((activeTab === TAB_LBC || activeTab === TAB_BOOST) && noBalance)
-            ? <>
+          ) : !((activeTab === TAB_LBC || activeTab === TAB_BOOST) && noBalance) ? (
+            <>
               <div className="section">
                 <ChannelSelector />
               </div>
 
               {activeTab === TAB_FIAT && !hasCardSaved && (
                 <h3 className="add-card-prompt">
-                  <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card')} button="link" />
-                  {' '}{__('To Tip Creators')}
+                  <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card')} button="link" />{' '}
+                  {__('To Tip Creators')}
                 </h3>
               )}
 
@@ -625,28 +639,36 @@ function WalletSendTip(props: Props) {
                 <div className="help">{__('The payment will be made from your saved card')}</div>
               )}
             </>
-              // if it's LBC and there is no balance, you can prompt to purchase LBC
-               : <Card
-                 title={<I18nMessage tokens={{ lbc: <LbcSymbol size={22} /> }}>Supporting content requires %lbc%</I18nMessage>}
-                 subtitle={
-                    <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>
-                      With %lbc%, you can send tips to your favorite creators, or help boost their content for more people to
-                      see.
-                    </I18nMessage>
-                  }
-                 actions={
-                    <div className="section__actions">
-                      <Button
-                        icon={ICONS.REWARDS}
-                        button="primary"
-                        label={__('Earn Rewards')}
-                        navigate={`/$/${PAGES.REWARDS}`}
-                      />
-                      <Button icon={ICONS.BUY} button="secondary" label={__('Buy/Swap Credits')} navigate={`/$/${PAGES.BUY}`} />
-                      <Button button="link" label={__('Nevermind')} onClick={closeModal} />
-                    </div>
-                  }
-              />
+          ) : (
+            // if it's LBC and there is no balance, you can prompt to purchase LBC
+            <Card
+              title={
+                <I18nMessage tokens={{ lbc: <LbcSymbol size={22} /> }}>Supporting content requires %lbc%</I18nMessage>
+              }
+              subtitle={
+                <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>
+                  With %lbc%, you can send tips to your favorite creators, or help boost their content for more people
+                  to see.
+                </I18nMessage>
+              }
+              actions={
+                <div className="section__actions">
+                  <Button
+                    icon={ICONS.REWARDS}
+                    button="primary"
+                    label={__('Earn Rewards')}
+                    navigate={`/$/${PAGES.REWARDS}`}
+                  />
+                  <Button
+                    icon={ICONS.BUY}
+                    button="secondary"
+                    label={__('Buy/Swap Credits')}
+                    navigate={`/$/${PAGES.BUY}`}
+                  />
+                  <Button button="link" label={__('Nevermind')} onClick={closeModal} />
+                </div>
+              }
+            />
           )
         }
       />
diff --git a/ui/component/walletTipAmountSelector/view.jsx b/ui/component/walletTipAmountSelector/view.jsx
index eeb526e39..25c402810 100644
--- a/ui/component/walletTipAmountSelector/view.jsx
+++ b/ui/component/walletTipAmountSelector/view.jsx
@@ -11,14 +11,8 @@ import classnames from 'classnames';
 import usePersistedState from 'effects/use-persisted-state';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
 import { Lbryio } from 'lbryinc';
-import { STRIPE_PUBLIC_KEY } from 'config';
-
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 const DEFAULT_TIP_AMOUNTS = [1, 5, 25, 100];
 
@@ -76,45 +70,49 @@ function WalletTipAmountSelector(props: Props) {
 
   // check if creator has a payment method saved
   React.useEffect(() => {
-    Lbryio.call(
-      'customer',
-      'status',
-      {
-        environment: stripeEnvironment,
-      },
-      'post'
-    ).then((customerStatusResponse) => {
-      const defaultPaymentMethodId =
-        customerStatusResponse.Customer &&
-        customerStatusResponse.Customer.invoice_settings &&
-        customerStatusResponse.Customer.invoice_settings.default_payment_method &&
-        customerStatusResponse.Customer.invoice_settings.default_payment_method.id;
+    if (stripeEnvironment) {
+      Lbryio.call(
+        'customer',
+        'status',
+        {
+          environment: stripeEnvironment,
+        },
+        'post'
+      ).then((customerStatusResponse) => {
+        const defaultPaymentMethodId =
+          customerStatusResponse.Customer &&
+          customerStatusResponse.Customer.invoice_settings &&
+          customerStatusResponse.Customer.invoice_settings.default_payment_method &&
+          customerStatusResponse.Customer.invoice_settings.default_payment_method.id;
 
-      setHasSavedCard(Boolean(defaultPaymentMethodId));
-    });
-  }, []);
+        setHasSavedCard(Boolean(defaultPaymentMethodId));
+      });
+    }
+  }, [stripeEnvironment]);
 
   //
   React.useEffect(() => {
-    Lbryio.call(
-      'account',
-      'check',
-      {
-        channel_claim_id: channelClaimId,
-        channel_name: tipChannelName,
-        environment: stripeEnvironment,
-      },
-      'post'
-    )
-      .then((accountCheckResponse) => {
-        if (accountCheckResponse === true && canReceiveFiatTip !== true) {
-          setCanReceiveFiatTip(true);
-        }
-      })
-      .catch(function (error) {
-        // console.log(error);
-      });
-  }, []);
+    if (stripeEnvironment) {
+      Lbryio.call(
+        'account',
+        'check',
+        {
+          channel_claim_id: channelClaimId,
+          channel_name: tipChannelName,
+          environment: stripeEnvironment,
+        },
+        'post'
+      )
+        .then((accountCheckResponse) => {
+          if (accountCheckResponse === true && canReceiveFiatTip !== true) {
+            setCanReceiveFiatTip(true);
+          }
+        })
+        .catch(function (error) {
+          // console.log(error);
+        });
+    }
+  }, [stripeEnvironment]);
 
   React.useEffect(() => {
     // setHasSavedCard(false);
@@ -214,7 +212,7 @@ function WalletTipAmountSelector(props: Props) {
           <div className="help">
             <span className="help--spendable">
               <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
-              {__(' Tip Creators')}
+              {__('Tip Creators')}
             </span>
           </div>
         </>
@@ -282,7 +280,7 @@ function WalletTipAmountSelector(props: Props) {
           <div className="help">
             <span className="help--spendable">
               <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
-              {__(' Tip Creators')}
+              {__('Tip Creators')}
             </span>
           </div>
         </>
diff --git a/ui/constants/stripe.js b/ui/constants/stripe.js
new file mode 100644
index 000000000..95f355892
--- /dev/null
+++ b/ui/constants/stripe.js
@@ -0,0 +1,2 @@
+export const TEST = 'test';
+export const LIVE = 'live';
diff --git a/ui/effects/use-lighthouse.js b/ui/effects/use-lighthouse.js
index b5b9f31e5..029668c20 100644
--- a/ui/effects/use-lighthouse.js
+++ b/ui/effects/use-lighthouse.js
@@ -25,7 +25,7 @@ export default function useLighthouse(
       let isSubscribed = true;
       lighthouse
         .search(throttledQuery)
-        .then(({ body: results }) => {
+        .then((results) => {
           if (isSubscribed) {
             setResults(
               results.map((result) => `lbry://${result.name}#${result.claimId}`).filter((uri) => isURIValid(uri))
diff --git a/ui/modal/modalRemoveCard/view.jsx b/ui/modal/modalRemoveCard/view.jsx
index b4047dab1..1cc984f26 100644
--- a/ui/modal/modalRemoveCard/view.jsx
+++ b/ui/modal/modalRemoveCard/view.jsx
@@ -5,43 +5,19 @@ import Card from 'component/common/card';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
 import { Lbryio } from 'lbryinc';
-import { STRIPE_PUBLIC_KEY } from 'config';
-
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 type Props = {
   closeModal: () => void,
-  abandonTxo: (Txo, () => void) => void,
-  abandonClaim: (string, number, ?() => void) => void,
-  tx: Txo,
-  claim: GenericClaim,
-  cb: () => void,
-  doResolveUri: (string) => void,
-  uri: string,
   paymentMethodId: string,
-  setAsConfirmingCard: () => void,
+  setAsConfirmingCard: () => void, // ?
 };
 
-export default function ModalRevokeClaim(props: Props) {
-  var that = this;
-  console.log(that);
-
-  console.log(props);
-
-  const { closeModal, uri, paymentMethodId, setAsConfirmingCard } = props;
-
-  console.log(uri);
-
-  console.log(setAsConfirmingCard);
+export default function ModalRemoveCard(props: Props) {
+  const { closeModal, paymentMethodId } = props;
 
   function removeCard() {
-    console.log(paymentMethodId);
-
     Lbryio.call(
       'customer',
       'detach',
@@ -51,11 +27,9 @@ export default function ModalRevokeClaim(props: Props) {
       },
       'post'
     ).then((removeCardResponse) => {
-      console.log(removeCardResponse);
-
       // TODO: add toast here
       // closeModal();
-
+      // Is there a better way to handle this? Why reload?
       window.location.reload();
     });
   }
@@ -63,15 +37,14 @@ export default function ModalRevokeClaim(props: Props) {
   return (
     <Modal ariaHideApp={false} isOpen contentLabel={'hello'} type="card" onAborted={closeModal}>
       <Card
-        title={'Confirm Remove Card'}
-        // body={getMsgBody(type, isSupport, name)}
+        title={__('Confirm Remove Card')}
         actions={
           <div className="section__actions">
             <Button
               className="stripe__confirm-remove-card"
               button="secondary"
               icon={ICONS.DELETE}
-              label={'Remove Card'}
+              label={__('Remove Card')}
               onClick={removeCard}
             />
             <Button button="link" label={__('Cancel')} onClick={closeModal} />
diff --git a/ui/page/file/view.jsx b/ui/page/file/view.jsx
index 987b6bcac..20f39e38b 100644
--- a/ui/page/file/view.jsx
+++ b/ui/page/file/view.jsx
@@ -12,7 +12,6 @@ import FileRenderDownload from 'component/fileRenderDownload';
 import RecommendedContent from 'component/recommendedContent';
 import CollectionContent from 'component/collectionContentSidebar';
 import CommentsList from 'component/commentsList';
-import { Redirect } from 'react-router';
 import Button from 'component/button';
 import I18nMessage from 'component/i18nMessage';
 import Empty from 'component/common/empty';
@@ -145,10 +144,6 @@ function FilePage(props: Props) {
     );
   }
 
-  if (!claimIsMine && isLivestream) {
-    return <Redirect to={`/$/${PAGES.LIVESTREAM}`} />;
-  }
-
   if (obscureNsfw && isMature) {
     return (
       <Page className="file-page" filePage isMarkdown={isMarkdown}>
diff --git a/ui/page/search/index.js b/ui/page/search/index.js
index d1c140fd1..30558e61a 100644
--- a/ui/page/search/index.js
+++ b/ui/page/search/index.js
@@ -3,7 +3,7 @@ import { withRouter } from 'react-router';
 import { doSearch } from 'redux/actions/search';
 import {
   selectIsSearching,
-  makeSelectSearchUrisForQuery,
+  makeSelectSearchUris,
   selectSearchOptions,
   makeSelectHasReachedMaxResultsLength,
 } from 'redux/selectors/search';
@@ -28,7 +28,7 @@ const select = (state, props) => {
   };
 
   const query = getSearchQueryString(urlQuery, searchOptions);
-  const uris = makeSelectSearchUrisForQuery(query)(state);
+  const uris = makeSelectSearchUris(query)(state);
   const hasReachedMaxResultsLength = makeSelectHasReachedMaxResultsLength(query)(state);
 
   return {
diff --git a/ui/page/settings/view.jsx b/ui/page/settings/view.jsx
index 3f201373a..60d29d385 100644
--- a/ui/page/settings/view.jsx
+++ b/ui/page/settings/view.jsx
@@ -20,6 +20,7 @@ import { SIMPLE_SITE } from 'config';
 import homepages from 'homepages';
 import { Lbryio } from 'lbryinc';
 import Yrbl from 'component/yrbl';
+import { getStripeEnvironment } from 'util/stripe';
 
 type Price = {
   currency: string,
@@ -451,7 +452,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             {/* @endif */}
 
             {/* @if TARGET='web' */}
-            {user && (
+            {user && getStripeEnvironment() && (
               <Card
                 title={__('Bank Accounts')}
                 subtitle={__('Connect a bank account to receive tips and compensation in your local currency')}
@@ -470,7 +471,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             {/* @endif */}
 
             {/* @if TARGET='web' */}
-            {isAuthenticated && (
+            {isAuthenticated && getStripeEnvironment() && (
               <Card
                 title={__('Payment Methods')}
                 subtitle={__('Add a credit card to tip creators in their local currency')}
diff --git a/ui/page/settingsStripeAccount/view.jsx b/ui/page/settingsStripeAccount/view.jsx
index 9c115cf6c..f91caaf57 100644
--- a/ui/page/settingsStripeAccount/view.jsx
+++ b/ui/page/settingsStripeAccount/view.jsx
@@ -7,17 +7,12 @@ import Card from 'component/common/card';
 import Page from 'component/page';
 
 import { Lbryio } from 'lbryinc';
-import { URL, WEBPACK_WEB_PORT, STRIPE_PUBLIC_KEY } from 'config';
+import { URL, WEBPACK_WEB_PORT } from 'config';
+import { getStripeEnvironment } from 'util/stripe';
 
 const isDev = process.env.NODE_ENV !== 'production';
 
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
-
+let stripeEnvironment = getStripeEnvironment();
 let successStripeRedirectUrl, failureStripeRedirectUrl;
 let successEndpoint = '/$/settings/tip_account';
 let failureEndpoint = '/$/settings/tip_account';
@@ -46,7 +41,7 @@ type State = {
   unpaidBalance: number,
   pageTitle: string,
   stillRequiringVerification: boolean,
-  accountTransactions: any
+  accountTransactions: any,
 };
 
 class StripeAccountConnection extends React.Component<Props, State> {
@@ -144,7 +139,10 @@ class StripeAccountConnection extends React.Component<Props, State> {
             stillRequiringVerification: false,
           };
 
-          if ((eventuallyDueInformation && eventuallyDueInformation.length) || (currentlyDueInformation && currentlyDueInformation.length)) {
+          if (
+            (eventuallyDueInformation && eventuallyDueInformation.length) ||
+            (currentlyDueInformation && currentlyDueInformation.length)
+          ) {
             objectToUpdateState.stillRequiringVerification = true;
             getAndSetAccountLink(false);
           }
@@ -233,8 +231,17 @@ class StripeAccountConnection extends React.Component<Props, State> {
                   <div>
                     <div>
                       <h3>{__('Congratulations! Your account has been connected with Odysee.')}</h3>
-                      {stillRequiringVerification && <><h3 style={{marginTop: '10px'}}>Although your account is connected it still requires verification to begin receiving tips.</h3>
-                      <h3 style={{marginTop: '10px'}}>Please use the button below to complete your verification process and enable tipping for your account.</h3></> }
+                      {stillRequiringVerification && (
+                        <>
+                          <h3 style={{ marginTop: '10px' }}>
+                            Although your account is connected it still requires verification to begin receiving tips.
+                          </h3>
+                          <h3 style={{ marginTop: '10px' }}>
+                            Please use the button below to complete your verification process and enable tipping for
+                            your account.
+                          </h3>
+                        </>
+                      )}
                     </div>
                   </div>
                 </div>
@@ -254,9 +261,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
                       <br />
                       <div>
                         <h3>
-                          {__(
-                            'Connect your bank account to be able to cash your pending balance out to your account.'
-                          )}
+                          {__('Connect your bank account to be able to cash your pending balance out to your account.')}
                         </h3>
                       </div>
                       <div className="section__actions">
@@ -271,19 +276,23 @@ class StripeAccountConnection extends React.Component<Props, State> {
             </div>
           }
           actions={
-            <>{ stillRequiringVerification && <Button
-              button="primary"
-              label={__('Complete Verification')}
-              icon={ICONS.SETTINGS}
-              navigate={stripeConnectionUrl}
-              className="stripe__complete-verification-button"
-            /> }
-            <Button
-              button="secondary"
-              label={__('View Transactions')}
-              icon={ICONS.SETTINGS}
-              navigate={`/$/${PAGES.WALLET}?tab=fiat-payment-history`}
-            /></>
+            <>
+              {stillRequiringVerification && (
+                <Button
+                  button="primary"
+                  label={__('Complete Verification')}
+                  icon={ICONS.SETTINGS}
+                  navigate={stripeConnectionUrl}
+                  className="stripe__complete-verification-button"
+                />
+              )}
+              <Button
+                button="secondary"
+                label={__('View Transactions')}
+                icon={ICONS.SETTINGS}
+                navigate={`/$/${PAGES.WALLET}?tab=fiat-payment-history`}
+              />
+            </>
           }
         />
         <br />
diff --git a/ui/page/settingsStripeCard/view.jsx b/ui/page/settingsStripeCard/view.jsx
index d3bef38ef..7c1903ab9 100644
--- a/ui/page/settingsStripeCard/view.jsx
+++ b/ui/page/settingsStripeCard/view.jsx
@@ -5,19 +5,14 @@ import React from 'react';
 import Page from 'component/page';
 import Card from 'component/common/card';
 import { Lbryio } from 'lbryinc';
-import { STRIPE_PUBLIC_KEY } from 'config';
 import Plastic from 'react-plastic';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
 import * as MODALS from 'constants/modal_types';
 import * as PAGES from 'constants/pages';
-
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+import { STRIPE_PUBLIC_KEY } from 'config';
+import { getStripeEnvironment } from 'util/stripe';
+let stripeEnvironment = getStripeEnvironment();
 
 const APIS_DOWN_ERROR_RESPONSE = __('There was an error from the server, please try again later');
 const CARD_SETUP_ERROR_RESPONSE = __('There was an error getting your card setup, please try again later');
@@ -79,114 +74,116 @@ class SettingsStripeCard extends React.Component<Props, State> {
     // TODO: fix this, should be a cleaner way
     setTimeout(function () {
       // check if customer has card setup already
-      Lbryio.call(
-        'customer',
-        'status',
-        {
-          environment: stripeEnvironment,
-        },
-        'post'
-      )
-        .then((customerStatusResponse) => {
-          // user has a card saved if their defaultPaymentMethod has an id
-          const defaultPaymentMethod = customerStatusResponse.Customer.invoice_settings.default_payment_method;
-          let userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
+      if (stripeEnvironment) {
+        Lbryio.call(
+          'customer',
+          'status',
+          {
+            environment: stripeEnvironment,
+          },
+          'post'
+        )
+          .then((customerStatusResponse) => {
+            // user has a card saved if their defaultPaymentMethod has an id
+            const defaultPaymentMethod = customerStatusResponse.Customer.invoice_settings.default_payment_method;
+            let userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
 
-          // show different frontend if user already has card
-          if (userHasAlreadySetupPayment) {
-            let card = customerStatusResponse.PaymentMethods[0].card;
+            // show different frontend if user already has card
+            if (userHasAlreadySetupPayment) {
+              let card = customerStatusResponse.PaymentMethods[0].card;
 
-            let customer = customerStatusResponse.Customer;
+              let customer = customerStatusResponse.Customer;
 
-            let topOfDisplay = customer.email.split('@')[0];
-            let bottomOfDisplay = '@' + customer.email.split('@')[1];
+              let topOfDisplay = customer.email.split('@')[0];
+              let bottomOfDisplay = '@' + customer.email.split('@')[1];
 
-            let cardDetails = {
-              brand: card.brand,
-              expiryYear: card.exp_year,
-              expiryMonth: card.exp_month,
-              lastFour: card.last4,
-              topOfDisplay: topOfDisplay,
-              bottomOfDisplay: bottomOfDisplay,
-            };
+              let cardDetails = {
+                brand: card.brand,
+                expiryYear: card.exp_year,
+                expiryMonth: card.exp_month,
+                lastFour: card.last4,
+                topOfDisplay: topOfDisplay,
+                bottomOfDisplay: bottomOfDisplay,
+              };
 
-            that.setState({
-              currentFlowStage: 'cardConfirmed',
-              pageTitle: 'Tip History',
-              userCardDetails: cardDetails,
-              paymentMethodId: customerStatusResponse.PaymentMethods[0].id,
-            });
+              that.setState({
+                currentFlowStage: 'cardConfirmed',
+                pageTitle: 'Tip History',
+                userCardDetails: cardDetails,
+                paymentMethodId: customerStatusResponse.PaymentMethods[0].id,
+              });
 
-            // otherwise, prompt them to save a card
-          } else {
-            that.setState({
-              currentFlowStage: 'confirmingCard',
-            });
+              // otherwise, prompt them to save a card
+            } else {
+              that.setState({
+                currentFlowStage: 'confirmingCard',
+              });
 
-            // get a payment method secret for frontend
+              // get a payment method secret for frontend
+              Lbryio.call(
+                'customer',
+                'setup',
+                {
+                  environment: stripeEnvironment,
+                },
+                'post'
+              ).then((customerSetupResponse) => {
+                clientSecret = customerSetupResponse.client_secret;
+
+                // instantiate stripe elements
+                setupStripe();
+              });
+            }
+
+            // get customer transactions
             Lbryio.call(
               'customer',
-              'setup',
+              'list',
               {
                 environment: stripeEnvironment,
               },
               'post'
-            ).then((customerSetupResponse) => {
-              clientSecret = customerSetupResponse.client_secret;
-
-              // instantiate stripe elements
-              setupStripe();
+            ).then((customerTransactionsResponse) => {
+              that.setState({
+                customerTransactions: customerTransactionsResponse,
+              });
             });
-          }
+            // if the status call fails, either an actual error or need to run setup first
+          })
+          .catch(function (error) {
+            // errorString passed from the API (with a 403 error)
+            const errorString = 'user as customer is not setup yet';
 
-          // get customer transactions
-          Lbryio.call(
-            'customer',
-            'list',
-            {
-              environment: stripeEnvironment,
-            },
-            'post'
-          ).then((customerTransactionsResponse) => {
-            that.setState({
-              customerTransactions: customerTransactionsResponse,
-            });
+            // if it's beamer's error indicating the account is not linked yet
+            if (error.message && error.message.indexOf(errorString) > -1) {
+              // send them to save a card
+              that.setState({
+                currentFlowStage: 'confirmingCard',
+              });
+
+              // get a payment method secret for frontend
+              Lbryio.call(
+                'customer',
+                'setup',
+                {
+                  environment: stripeEnvironment,
+                },
+                'post'
+              ).then((customerSetupResponse) => {
+                clientSecret = customerSetupResponse.client_secret;
+
+                // instantiate stripe elements
+                setupStripe();
+              });
+              // 500 error from the backend being down
+            } else if (error === 'internal_apis_down') {
+              doToast({ message: APIS_DOWN_ERROR_RESPONSE, isError: true });
+            } else {
+              // probably an error from stripe
+              doToast({ message: CARD_SETUP_ERROR_RESPONSE, isError: true });
+            }
           });
-          // if the status call fails, either an actual error or need to run setup first
-        })
-        .catch(function (error) {
-          // errorString passed from the API (with a 403 error)
-          const errorString = 'user as customer is not setup yet';
-
-          // if it's beamer's error indicating the account is not linked yet
-          if (error.message && error.message.indexOf(errorString) > -1) {
-            // send them to save a card
-            that.setState({
-              currentFlowStage: 'confirmingCard',
-            });
-
-            // get a payment method secret for frontend
-            Lbryio.call(
-              'customer',
-              'setup',
-              {
-                environment: stripeEnvironment,
-              },
-              'post'
-            ).then((customerSetupResponse) => {
-              clientSecret = customerSetupResponse.client_secret;
-
-              // instantiate stripe elements
-              setupStripe();
-            });
-            // 500 error from the backend being down
-          } else if (error === 'internal_apis_down') {
-            doToast({ message: APIS_DOWN_ERROR_RESPONSE, isError: true });
-          } else {
-            // probably an error from stripe
-            doToast({ message: CARD_SETUP_ERROR_RESPONSE, isError: true });
-          }
-        });
+      }
     }, 250);
 
     function setupStripe() {
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 10fd38710..140468b5e 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { DOMAIN } from 'config';
+import { DOMAIN, ENABLE_NO_SOURCE_CLAIMS } from 'config';
 import * as PAGES from 'constants/pages';
 import React, { useEffect } from 'react';
 import { lazyImport } from 'util/lazyImport';
@@ -199,7 +199,7 @@ function ShowPage(props: Props) {
           />
         </Page>
       );
-    } else if (isLivestream) {
+    } else if (isLivestream && ENABLE_NO_SOURCE_CLAIMS) {
       innerContent = <LivestreamPage uri={uri} />;
     } else {
       innerContent = <FilePage uri={uri} location={location} />;
diff --git a/ui/page/wallet/view.jsx b/ui/page/wallet/view.jsx
index 38332f361..d056e74d9 100644
--- a/ui/page/wallet/view.jsx
+++ b/ui/page/wallet/view.jsx
@@ -12,8 +12,8 @@ import * as PAGES from 'constants/pages';
 import Spinner from 'component/spinner';
 import YrblWalletEmpty from 'component/yrblWalletEmpty';
 import { Lbryio } from 'lbryinc';
-import { STRIPE_PUBLIC_KEY } from 'config';
 import { Tabs, TabList, Tab, TabPanels, TabPanel } from 'component/common/tabs';
+import { getStripeEnvironment } from 'util/stripe';
 
 const TAB_QUERY = 'tab';
 
@@ -23,12 +23,7 @@ const TABS = {
   PAYMENT_HISTORY: 'fiat-payment-history',
 };
 
-let stripeEnvironment = 'test';
-// if the key contains pk_live it's a live key
-// update the environment for the calls to the backend to indicate which environment to hit
-if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-  stripeEnvironment = 'live';
-}
+let stripeEnvironment = getStripeEnvironment();
 
 type Props = {
   history: { action: string, push: (string) => void, replace: (string) => void },
@@ -117,8 +112,11 @@ const WalletPage = (props: Props) => {
 
   // calculate account transactions section
   React.useEffect(() => {
-    (async function() {
+    (async function () {
       try {
+        if (!stripeEnvironment) {
+          return;
+        }
         const response = await getAccountStatus();
 
         setAccountStatusResponse(response);
@@ -131,23 +129,27 @@ const WalletPage = (props: Props) => {
         console.log(err);
       }
     })();
-  }, []);
+  }, [stripeEnvironment]);
 
   // populate customer payment data
   React.useEffect(() => {
-    (async function() {
+    (async function () {
       try {
         // get card payments customer has made
+        if (!stripeEnvironment) {
+          return;
+        }
         let customerTransactionResponse = await getPaymentHistory();
-
-        customerTransactionResponse.reverse();
+        if (customerTransactionResponse && customerTransactionResponse.length) {
+          customerTransactionResponse.reverse();
+        }
 
         setCustomerTransactions(customerTransactionResponse);
       } catch (err) {
         console.log(err);
       }
     })();
-  }, []);
+  }, [stripeEnvironment]);
 
   // @endif
 
@@ -157,77 +159,80 @@ const WalletPage = (props: Props) => {
 
   return (
     <>
-      {/* @if TARGET='web' */}
-      <Page>
-        <Tabs onChange={onTabChange} index={tabIndex}>
-          <TabList className="tabs__list--collection-edit-page">
-            <Tab>{__('LBRY Credits')}</Tab>
-            <Tab>{__('Account History')}</Tab>
-            <Tab>{__('Payment History')}</Tab>
-          </TabList>
-          <TabPanels>
-            <TabPanel>
-              <div className="section card-stack">
-                <div className="lbc-transactions">
-                  {/* if the transactions are loading */}
-                  {loading && (
-                    <div className="main--empty">
-                      <Spinner delayed />
-                    </div>
-                  )}
-                  {/* when the transactions are finished loading */}
-                  {!loading && (
-                    <>
-                      {showIntro ? (
-                        <YrblWalletEmpty includeWalletLink />
-                      ) : (
-                        <div className="card-stack">
-                          <WalletBalance />
-                          <TxoList search={search} />
-                        </div>
-                      )}
-                    </>
-                  )}
+      {stripeEnvironment && (
+        <Page>
+          <Tabs onChange={onTabChange} index={tabIndex}>
+            <TabList className="tabs__list--collection-edit-page">
+              <Tab>{__('LBRY Credits')}</Tab>
+              <Tab>{__('Account History')}</Tab>
+              <Tab>{__('Payment History')}</Tab>
+            </TabList>
+            <TabPanels>
+              <TabPanel>
+                <div className="section card-stack">
+                  <div className="lbc-transactions">
+                    {/* if the transactions are loading */}
+                    {loading && (
+                      <div className="main--empty">
+                        <Spinner delayed />
+                      </div>
+                    )}
+                    {/* when the transactions are finished loading */}
+                    {!loading && (
+                      <>
+                        {showIntro ? (
+                          <YrblWalletEmpty includeWalletLink />
+                        ) : (
+                          <div className="card-stack">
+                            <WalletBalance />
+                            <TxoList search={search} />
+                          </div>
+                        )}
+                      </>
+                    )}
+                  </div>
                 </div>
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div className="section card-stack">
-                <WalletFiatBalance accountDetails={accountStatusResponse} />
-                <WalletFiatAccountHistory transactions={accountTransactionResponse} />
-              </div>
-            </TabPanel>
-            <TabPanel>
-              <div className="section card-stack">
-                <WalletFiatPaymentBalance transactions={customerTransactions} accountDetails={accountStatusResponse} />
-                <WalletFiatPaymentHistory transactions={customerTransactions} />
-              </div>
-            </TabPanel>
-          </TabPanels>
-        </Tabs>
-      </Page>
-      {/* @endif */}
-      {/* @if TARGET='app' */}
-      <Page>
-        {loading && (
-          <div className="main--empty">
-            <Spinner delayed />
-          </div>
-        )}
-        {!loading && (
-          <>
-            {showIntro ? (
-              <YrblWalletEmpty includeWalletLink />
-            ) : (
-              <div className="card-stack">
-                <WalletBalance />
-                <TxoList search={search} />
-              </div>
-            )}
-          </>
-        )}
-      </Page>
-      {/* @endif */}
+              </TabPanel>
+              <TabPanel>
+                <div className="section card-stack">
+                  <WalletFiatBalance accountDetails={accountStatusResponse} />
+                  <WalletFiatAccountHistory transactions={accountTransactionResponse} />
+                </div>
+              </TabPanel>
+              <TabPanel>
+                <div className="section card-stack">
+                  <WalletFiatPaymentBalance
+                    transactions={customerTransactions}
+                    accountDetails={accountStatusResponse}
+                  />
+                  <WalletFiatPaymentHistory transactions={customerTransactions} />
+                </div>
+              </TabPanel>
+            </TabPanels>
+          </Tabs>
+        </Page>
+      )}
+      {!stripeEnvironment && (
+        <Page>
+          {loading && (
+            <div className="main--empty">
+              <Spinner delayed />
+            </div>
+          )}
+          {!loading && (
+            <>
+              {showIntro ? (
+                <YrblWalletEmpty includeWalletLink />
+              ) : (
+                <div className="card-stack">
+                  <WalletBalance />
+                  <TxoList search={search} />
+                </div>
+              )}
+            </>
+          )}
+        </Page>
+      )}
     </>
   );
 };
diff --git a/ui/redux/actions/search.js b/ui/redux/actions/search.js
index 28b1a724c..0da0039d0 100644
--- a/ui/redux/actions/search.js
+++ b/ui/redux/actions/search.js
@@ -2,7 +2,7 @@
 import * as ACTIONS from 'constants/action_types';
 import { SEARCH_OPTIONS } from 'constants/search';
 import { buildURI, doResolveUris, batchActions, isURIValid, makeSelectClaimForUri } from 'lbry-redux';
-import { makeSelectSearchUrisForQuery, selectSearchValue } from 'redux/selectors/search';
+import { makeSelectSearchUris, selectSearchValue } from 'redux/selectors/search';
 import handleFetchResponse from 'util/handle-fetch';
 import { getSearchQueryString } from 'util/query-params';
 import { SIMPLE_SITE, SEARCH_SERVER_API } from 'config';
@@ -48,7 +48,7 @@ export const doSearch = (rawQuery: string, searchOptions: SearchOptions) => (
   const from = searchOptions.from;
 
   // If we have already searched for something, we don't need to do anything
-  const urisForQuery = makeSelectSearchUrisForQuery(queryWithOptions)(state);
+  const urisForQuery = makeSelectSearchUris(queryWithOptions)(state);
   if (urisForQuery && !!urisForQuery.length) {
     if (!size || !from || from + size < urisForQuery.length) {
       return;
@@ -61,14 +61,13 @@ export const doSearch = (rawQuery: string, searchOptions: SearchOptions) => (
 
   lighthouse
     .search(queryWithOptions)
-    .then((data: { body: Array<{ name: string, claimId: string }>, poweredBy: string }) => {
-      const { body: result, poweredBy } = data;
+    .then((data: Array<{ name: string, claimId: string }>) => {
       const uris = [];
       const actions = [];
 
-      result.forEach((item) => {
-        if (item) {
-          const { name, claimId } = item;
+      data.forEach((result) => {
+        if (result) {
+          const { name, claimId } = result;
           const urlObj: LbryUrlObj = {};
 
           if (name.startsWith('@')) {
@@ -95,7 +94,6 @@ export const doSearch = (rawQuery: string, searchOptions: SearchOptions) => (
           from: from,
           size: size,
           uris,
-          recsys: poweredBy,
         },
       });
       dispatch(batchActions(...actions));
diff --git a/ui/redux/reducers/comments.js b/ui/redux/reducers/comments.js
index 30a558fe7..4e539e67c 100644
--- a/ui/redux/reducers/comments.js
+++ b/ui/redux/reducers/comments.js
@@ -301,10 +301,9 @@ export default handleActions(
             for (let i = 0; i < comments.length; ++i) {
               const comment = comments[i];
               commonUpdateAction(comment, commentById, commentIds, i);
+              pushToArrayInObject(topLevelCommentsById, claimId, comment.comment_id);
               if (comment.is_pinned) {
                 pushToArrayInObject(pinnedCommentsById, claimId, comment.comment_id);
-              } else {
-                pushToArrayInObject(topLevelCommentsById, claimId, comment.comment_id);
               }
             }
           }
@@ -616,50 +615,45 @@ export default handleActions(
       const topLevelCommentsById = Object.assign({}, state.topLevelCommentsById);
       const pinnedCommentsById = Object.assign({}, state.pinnedCommentsById);
 
-      if (pinnedComment) {
-        if (topLevelCommentsById[claimId]) {
-          const index = topLevelCommentsById[claimId].indexOf(pinnedComment.comment_id);
-          if (index > -1) {
-            topLevelCommentsById[claimId].splice(index, 1);
+      if (pinnedComment && topLevelCommentsById[claimId]) {
+        const index = topLevelCommentsById[claimId].indexOf(pinnedComment.comment_id);
+        if (index > -1) {
+          topLevelCommentsById[claimId].splice(index, 1);
+
+          if (pinnedCommentsById[claimId]) {
+            // Remove here so that the 'unshift' below will be a unique entry.
+            pinnedCommentsById[claimId] = pinnedCommentsById[claimId].filter((x) => x !== pinnedComment.comment_id);
+          } else {
+            pinnedCommentsById[claimId] = [];
           }
-        } else {
-          topLevelCommentsById[claimId] = [];
-        }
 
-        if (pinnedCommentsById[claimId]) {
-          const index = pinnedCommentsById[claimId].indexOf(pinnedComment.comment_id);
-          if (index > -1) {
-            pinnedCommentsById[claimId].splice(index, 1);
+          if (unpin) {
+            // Without the sort score, I have no idea where to put it. Just
+            // dump it at the bottom. Users can refresh if they want it back to
+            // the correct sorted position.
+            topLevelCommentsById[claimId].push(pinnedComment.comment_id);
+          } else {
+            topLevelCommentsById[claimId].unshift(pinnedComment.comment_id);
+            pinnedCommentsById[claimId].unshift(pinnedComment.comment_id);
           }
-        } else {
-          pinnedCommentsById[claimId] = [];
-        }
 
-        if (unpin) {
-          // Without the sort score, I have no idea where to put it. Just
-          // dump it at the top. Users can refresh if they want it back to
-          // the correct sorted position.
-          topLevelCommentsById[claimId].unshift(pinnedComment.comment_id);
-        } else {
-          pinnedCommentsById[claimId].unshift(pinnedComment.comment_id);
-        }
-
-        if (commentById[pinnedComment.comment_id]) {
-          // Commentron's `comment.Pin` response places the creator's credentials
-          // in the 'channel_*' fields, which doesn't make sense. Maybe it is to
-          // show who signed/pinned it, but even if so, it shouldn't overload
-          // these variables which are already used by existing comment data structure.
-          // Ensure we don't override the existing/correct values, but fallback
-          // to whatever was given.
-          const { channel_id, channel_name, channel_url } = commentById[pinnedComment.comment_id];
-          commentById[pinnedComment.comment_id] = {
-            ...pinnedComment,
-            channel_id: channel_id || pinnedComment.channel_id,
-            channel_name: channel_name || pinnedComment.channel_name,
-            channel_url: channel_url || pinnedComment.channel_url,
-          };
-        } else {
-          commentById[pinnedComment.comment_id] = pinnedComment;
+          if (commentById[pinnedComment.comment_id]) {
+            // Commentron's `comment.Pin` response places the creator's credentials
+            // in the 'channel_*' fields, which doesn't make sense. Maybe it is to
+            // show who signed/pinned it, but even if so, it shouldn't overload
+            // these variables which are already used by existing comment data structure.
+            // Ensure we don't override the existing/correct values, but fallback
+            // to whatever was given.
+            const { channel_id, channel_name, channel_url } = commentById[pinnedComment.comment_id];
+            commentById[pinnedComment.comment_id] = {
+              ...pinnedComment,
+              channel_id: channel_id || pinnedComment.channel_id,
+              channel_name: channel_name || pinnedComment.channel_name,
+              channel_url: channel_url || pinnedComment.channel_url,
+            };
+          } else {
+            commentById[pinnedComment.comment_id] = pinnedComment;
+          }
         }
       }
 
diff --git a/ui/redux/reducers/search.js b/ui/redux/reducers/search.js
index e97f868ec..7730eeaa5 100644
--- a/ui/redux/reducers/search.js
+++ b/ui/redux/reducers/search.js
@@ -17,7 +17,7 @@ const defaultState: SearchState = {
     [SEARCH_OPTIONS.MEDIA_IMAGE]: defaultSearchTypes.includes(SEARCH_OPTIONS.MEDIA_IMAGE),
     [SEARCH_OPTIONS.MEDIA_APPLICATION]: defaultSearchTypes.includes(SEARCH_OPTIONS.MEDIA_APPLICATION),
   },
-  resultsByQuery: {},
+  urisByQuery: {},
   hasReachedMaxResultsLength: {},
   searching: false,
 };
@@ -29,23 +29,21 @@ export default handleActions(
       searching: true,
     }),
     [ACTIONS.SEARCH_SUCCESS]: (state: SearchState, action: SearchSuccess): SearchState => {
-      const { query, uris, from, size, recsys } = action.data;
+      const { query, uris, from, size } = action.data;
       const normalizedQuery = createNormalizedSearchKey(query);
-      const urisForQuery = state.resultsByQuery[normalizedQuery] && state.resultsByQuery[normalizedQuery]['uris'];
 
       let newUris = uris;
-      if (from !== 0 && urisForQuery) {
-        newUris = Array.from(new Set(urisForQuery.concat(uris)));
+      if (from !== 0 && state.urisByQuery[normalizedQuery]) {
+        newUris = Array.from(new Set(state.urisByQuery[normalizedQuery].concat(uris)));
       }
 
       // The returned number of urls is less than the page size, so we're on the last page
       const noMoreResults = size && uris.length < size;
 
-      const results = { uris: newUris, recsys };
       return {
         ...state,
         searching: false,
-        resultsByQuery: Object.assign({}, state.resultsByQuery, { [normalizedQuery]: results }),
+        urisByQuery: Object.assign({}, state.urisByQuery, { [normalizedQuery]: newUris }),
         hasReachedMaxResultsLength: Object.assign({}, state.hasReachedMaxResultsLength, {
           [normalizedQuery]: noMoreResults,
         }),
diff --git a/ui/redux/selectors/comments.js b/ui/redux/selectors/comments.js
index e1f53738c..a724a27f3 100644
--- a/ui/redux/selectors/comments.js
+++ b/ui/redux/selectors/comments.js
@@ -13,27 +13,7 @@ export const selectIsFetchingCommentsByParentId = createSelector(selectState, (s
 export const selectIsPostingComment = createSelector(selectState, (state) => state.isCommenting);
 export const selectIsFetchingReacts = createSelector(selectState, (state) => state.isFetchingReacts);
 export const selectOthersReactsById = createSelector(selectState, (state) => state.othersReactsByCommentId);
-
 export const selectPinnedCommentsById = createSelector(selectState, (state) => state.pinnedCommentsById);
-export const makeSelectPinnedCommentsForUri = (uri: string) =>
-  createSelector(
-    selectCommentsByUri,
-    selectCommentsById,
-    selectPinnedCommentsById,
-    (byUri, byId, pinnedCommentsById) => {
-      const claimId = byUri[uri];
-      const pinnedCommentIds = pinnedCommentsById && pinnedCommentsById[claimId];
-      const pinnedComments = [];
-
-      if (pinnedCommentIds) {
-        pinnedCommentIds.forEach((commentId) => {
-          pinnedComments.push(byId[commentId]);
-        });
-      }
-
-      return pinnedComments;
-    }
-  );
 
 export const selectModerationBlockList = createSelector(selectState, (state) =>
   state.moderationBlockList ? state.moderationBlockList.reverse() : []
diff --git a/ui/redux/selectors/search.js b/ui/redux/selectors/search.js
index 1d97b1976..d864ea00d 100644
--- a/ui/redux/selectors/search.js
+++ b/ui/redux/selectors/search.js
@@ -4,7 +4,6 @@ import { selectShowMatureContent } from 'redux/selectors/settings';
 import {
   parseURI,
   makeSelectClaimForUri,
-  makeSelectClaimForClaimId,
   makeSelectClaimIsNsfw,
   buildURI,
   isClaimNsfw,
@@ -27,9 +26,9 @@ export const selectSearchOptions: (state: State) => SearchOptions = createSelect
 
 export const selectIsSearching: (state: State) => boolean = createSelector(selectState, (state) => state.searching);
 
-export const selectSearchResultByQuery: (state: State) => { [string]: Array<string> } = createSelector(
+export const selectSearchUrisByQuery: (state: State) => { [string]: Array<string> } = createSelector(
   selectState,
-  (state) => state.resultsByQuery
+  (state) => state.urisByQuery
 );
 
 export const selectHasReachedMaxResultsLength: (state: State) => { [boolean]: Array<boolean> } = createSelector(
@@ -37,15 +36,15 @@ export const selectHasReachedMaxResultsLength: (state: State) => { [boolean]: Ar
   (state) => state.hasReachedMaxResultsLength
 );
 
-export const makeSelectSearchUrisForQuery = (query: string): ((state: State) => Array<string>) =>
+export const makeSelectSearchUris = (query: string): ((state: State) => Array<string>) =>
   // replace statement below is kind of ugly, and repeated in doSearch action
-  createSelector(selectSearchResultByQuery, (byQuery) => {
+  createSelector(selectSearchUrisByQuery, (byQuery) => {
     if (query) {
       query = query.replace(/^lbry:\/\//i, '').replace(/\//, ' ');
       const normalizedQuery = createNormalizedSearchKey(query);
-      return byQuery[normalizedQuery] && byQuery[normalizedQuery]['uris'];
+      return byQuery[normalizedQuery];
     }
-    return byQuery[query] && byQuery[query]['uris'];
+    return byQuery[query];
   });
 
 export const makeSelectHasReachedMaxResultsLength = (query: string): ((state: State) => boolean) =>
@@ -61,7 +60,7 @@ export const makeSelectHasReachedMaxResultsLength = (query: string): ((state: St
 export const makeSelectRecommendedContentForUri = (uri: string) =>
   createSelector(
     makeSelectClaimForUri(uri),
-    selectSearchResultByQuery,
+    selectSearchUrisByQuery,
     makeSelectClaimIsNsfw(uri),
     (claim, searchUrisByQuery, isMature) => {
       let recommendedContent;
@@ -85,47 +84,16 @@ export const makeSelectRecommendedContentForUri = (uri: string) =>
         const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options);
         const normalizedSearchQuery = createNormalizedSearchKey(searchQuery);
 
-        let searchResult = searchUrisByQuery[normalizedSearchQuery];
-        if (searchResult) {
-          recommendedContent = searchResult['uris'].filter((searchUri) => searchUri !== currentUri);
+        let searchUris = searchUrisByQuery[normalizedSearchQuery];
+        if (searchUris) {
+          searchUris = searchUris.filter((searchUri) => searchUri !== currentUri);
+          recommendedContent = searchUris;
         }
       }
       return recommendedContent;
     }
   );
 
-export const makeSelectRecommendedRecsysIdForClaimId = (claimId: string) =>
-  createSelector(makeSelectClaimForClaimId(claimId), selectSearchResultByQuery, (claim, searchUrisByQuery) => {
-    // TODO: DRY this out.
-    let poweredBy;
-    if (claim) {
-      const isMature = isClaimNsfw(claim);
-      const { title } = claim.value;
-
-      if (!title) {
-        return;
-      }
-
-      const options: {
-        related_to?: string,
-        nsfw?: boolean,
-        isBackgroundSearch?: boolean,
-      } = { related_to: claim.claim_id, isBackgroundSearch: true };
-
-      options['nsfw'] = isMature;
-      const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options);
-      const normalizedSearchQuery = createNormalizedSearchKey(searchQuery);
-
-      let searchResult = searchUrisByQuery[normalizedSearchQuery];
-      if (searchResult) {
-        poweredBy = searchResult.recsys;
-      } else {
-        return normalizedSearchQuery;
-      }
-    }
-    return poweredBy;
-  });
-
 export const makeSelectWinningUriForQuery = (query: string) => {
   const uriFromQuery = `lbry://${query}`;
 
diff --git a/ui/util/handle-fetch.js b/ui/util/handle-fetch.js
index 4686b9b1a..83ce10513 100644
--- a/ui/util/handle-fetch.js
+++ b/ui/util/handle-fetch.js
@@ -1,9 +1,4 @@
 // @flow
 export default function handleFetchResponse(response: Response): Promise<any> {
-  const headers = response.headers;
-  const poweredBy = headers.get('x-powered-by');
-
-  return response.status === 200
-    ? response.json().then((body) => ({ body, poweredBy }))
-    : Promise.reject(new Error(response.statusText));
+  return response.status === 200 ? Promise.resolve(response.json()) : Promise.reject(new Error(response.statusText));
 }
diff --git a/ui/util/stripe.js b/ui/util/stripe.js
new file mode 100644
index 000000000..09a72308b
--- /dev/null
+++ b/ui/util/stripe.js
@@ -0,0 +1,13 @@
+// @flow
+import { STRIPE_PUBLIC_KEY } from 'config';
+import * as STRIPE_CONSTS from 'constants/stripe';
+export function getStripeEnvironment() {
+  if (STRIPE_PUBLIC_KEY) {
+    if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+      return STRIPE_CONSTS.LIVE;
+    } else {
+      return STRIPE_CONSTS.TEST;
+    }
+  }
+  return null;
+}