diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/AccountHistory.js
index a16b334ca..0d85b62af 100644
--- a/client/coral-admin/src/components/AccountHistory.js
+++ b/client/coral-admin/src/components/AccountHistory.js
@@ -14,7 +14,7 @@ const buildUserHistory = (userState = {}) => {
   return orderBy(
     flatten(
       Object.keys(userState.status)
-        .filter(k => k !== '__typename')
+        .filter(k => !k.startsWith('__'))
         .map(k => userState.status[k].history)
     ),
     'created_at',
diff --git a/client/coral-admin/src/components/CommentDetails.js b/client/coral-admin/src/components/CommentDetails.js
index dc1be2d85..7a45219af 100644
--- a/client/coral-admin/src/components/CommentDetails.js
+++ b/client/coral-admin/src/components/CommentDetails.js
@@ -27,35 +27,28 @@ class CommentDetails extends Component {
   render() {
     const { data, root, comment, clearHeightCache } = this.props;
     const { showDetail } = this.state;
-    const queryData = {
+
+    const slotPassthrough = {
+      data,
+      clearHeightCache,
       root,
       comment,
+      more: showDetail,
     };
 
     return (
       <div className={styles.root}>
         <IfSlotIsNotEmpty
-          queryData={queryData}
           slot={['adminCommentMoreDetails', 'adminCommentMoreFlagDetails']}
+          passthrough={slotPassthrough}
         >
           <a onClick={this.toggleDetail} className={styles.moreDetail}>
             {showDetail ? t('modqueue.less_detail') : t('modqueue.more_detail')}
           </a>
         </IfSlotIsNotEmpty>
-        <Slot
-          fill="adminCommentDetailArea"
-          data={data}
-          clearHeightCache={clearHeightCache}
-          queryData={queryData}
-          more={showDetail}
-        />
+        <Slot fill="adminCommentDetailArea" passthrough={slotPassthrough} />
         {showDetail && (
-          <Slot
-            fill="adminCommentMoreDetails"
-            data={data}
-            clearHeightCache={clearHeightCache}
-            queryData={queryData}
-          />
+          <Slot fill="adminCommentMoreDetails" passthrough={slotPassthrough} />
         )}
       </div>
     );
diff --git a/client/coral-admin/src/components/CommentLabels.js b/client/coral-admin/src/components/CommentLabels.js
index 8eac152bd..1f71d9771 100644
--- a/client/coral-admin/src/components/CommentLabels.js
+++ b/client/coral-admin/src/components/CommentLabels.js
@@ -43,6 +43,9 @@ const CommentLabels = ({
   comment,
   comment: { className, status, actions, hasParent },
 }) => {
+  const slotPassthrough = {
+    comment,
+  };
   return (
     <div className={cn(className, styles.root)}>
       <div className={styles.coreLabels}>
@@ -69,7 +72,7 @@ const CommentLabels = ({
       <Slot
         className={styles.slot}
         fill="adminCommentLabels"
-        queryData={{ comment }}
+        passthrough={slotPassthrough}
       />
     </div>
   );
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index b1f68bac2..db71b3b78 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -123,6 +123,12 @@ class UserDetail extends React.Component {
     const banned = isBanned(user);
     const suspended = isSuspended(user);
 
+    const slotPassthrough = {
+      data,
+      root,
+      user,
+    };
+
     return (
       <ClickOutside onClickOutside={modal ? null : hideUserDetail}>
         <Drawer
@@ -244,11 +250,7 @@ class UserDetail extends React.Component {
             </ul>
           </div>
 
-          <Slot
-            fill="userProfile"
-            data={this.props.data}
-            queryData={{ root, user }}
-          />
+          <Slot fill="userProfile" passthrough={slotPassthrough} />
 
           <hr />
 
@@ -368,9 +370,7 @@ UserDetail.propTypes = {
   bulkReject: PropTypes.func.isRequired,
   toggleSelectAll: PropTypes.func.isRequired,
   loading: PropTypes.bool.isRequired,
-  data: PropTypes.shape({
-    refetch: PropTypes.func.isRequired,
-  }),
+  data: PropTypes.object,
   activeTab: PropTypes.string.isRequired,
   selectedCommentIds: PropTypes.array.isRequired,
   viewUserDetail: PropTypes.any.isRequired,
diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js
index ea898822a..a9e8c7ba9 100644
--- a/client/coral-admin/src/components/UserDetailComment.js
+++ b/client/coral-admin/src/components/UserDetailComment.js
@@ -36,9 +36,10 @@ class UserDetailComment extends React.Component {
       root: { settings },
     } = this.props;
 
-    const queryData = { root, comment };
-
-    const formatterSettings = {
+    const slotPassthrough = {
+      data,
+      root,
+      comment,
       suspectWords: settings.wordlist.suspect,
       bannedWords: settings.wordlist.banned,
       body: comment.body,
@@ -88,15 +89,13 @@ class UserDetailComment extends React.Component {
               <div className={styles.body}>
                 <Slot
                   fill="userDetailCommentContent"
-                  data={data}
                   className={cn(
                     styles.commentContent,
                     'talk-admin-user-detail-comment'
                   )}
-                  queryData={queryData}
                   size={1}
                   defaultComponent={CommentFormatter}
-                  {...formatterSettings}
+                  passthrough={slotPassthrough}
                 />
                 <a
                   className={styles.external}
diff --git a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
index 3b5f3bdd9..cf291cab1 100644
--- a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
@@ -52,7 +52,7 @@ class ModerationSettings extends React.Component {
   };
 
   render() {
-    const { settings, data, root, updatePending, errors } = this.props;
+    const { settings, slotPassthrough } = this.props;
 
     return (
       <ConfigurePage title={t('configure.moderation_settings')}>
@@ -82,13 +82,7 @@ class ModerationSettings extends React.Component {
           suspectWords={settings.wordlist.suspect}
           onChangeWordlist={this.updateWordlist}
         />
-        <Slot
-          fill="adminModerationSettings"
-          data={data}
-          queryData={{ root, settings }}
-          updatePending={updatePending}
-          errors={errors}
-        />
+        <Slot fill="adminModerationSettings" passthrough={slotPassthrough} />
       </ConfigurePage>
     );
   }
@@ -97,9 +91,8 @@ class ModerationSettings extends React.Component {
 ModerationSettings.propTypes = {
   updatePending: PropTypes.func.isRequired,
   errors: PropTypes.object.isRequired,
-  data: PropTypes.object.isRequired,
-  root: PropTypes.object.isRequired,
   settings: PropTypes.object.isRequired,
+  slotPassthrough: PropTypes.object.isRequired,
 };
 
 export default ModerationSettings;
diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index c447b8453..e6424848f 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -107,7 +107,7 @@ class StreamSettings extends React.Component {
   };
 
   render() {
-    const { settings, data, root, errors, updatePending } = this.props;
+    const { settings, slotPassthrough, errors } = this.props;
 
     return (
       <ConfigurePage title={t('configure.stream_settings')}>
@@ -220,13 +220,7 @@ class StreamSettings extends React.Component {
           </div>
         </ConfigureCard>
         {/* the above card should be the last one if at all possible because of z-index issues with the selects */}
-        <Slot
-          fill="adminStreamSettings"
-          data={data}
-          queryData={{ root, settings }}
-          updatePending={updatePending}
-          errors={errors}
-        />
+        <Slot fill="adminStreamSettings" passthrough={slotPassthrough} />
       </ConfigurePage>
     );
   }
@@ -235,9 +229,8 @@ class StreamSettings extends React.Component {
 StreamSettings.propTypes = {
   updatePending: PropTypes.func.isRequired,
   errors: PropTypes.object.isRequired,
-  data: PropTypes.object.isRequired,
-  root: PropTypes.object.isRequired,
   settings: PropTypes.object.isRequired,
+  slotPassthrough: PropTypes.object.isRequired,
 };
 
 export default StreamSettings;
diff --git a/client/coral-admin/src/routes/Configure/components/TechSettings.js b/client/coral-admin/src/routes/Configure/components/TechSettings.js
index 8bb10e9a3..e6d9ba8af 100644
--- a/client/coral-admin/src/routes/Configure/components/TechSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/TechSettings.js
@@ -34,7 +34,7 @@ class TechSettings extends React.Component {
   };
 
   render() {
-    const { settings, data, root, errors, updatePending } = this.props;
+    const { settings, slotPassthrough } = this.props;
     return (
       <ConfigurePage title={t('configure.tech_settings')}>
         <Domainlist
@@ -50,13 +50,7 @@ class TechSettings extends React.Component {
             onChange={this.updateCustomCssUrl}
           />
         </ConfigureCard>
-        <Slot
-          fill="adminTechSettings"
-          data={data}
-          queryData={{ root, settings }}
-          updatePending={updatePending}
-          errors={errors}
-        />
+        <Slot fill="adminTechSettings" passthrough={slotPassthrough} />
       </ConfigurePage>
     );
   }
@@ -64,10 +58,9 @@ class TechSettings extends React.Component {
 
 TechSettings.propTypes = {
   updatePending: PropTypes.func.isRequired,
-  errors: PropTypes.object.isRequired,
-  data: PropTypes.object.isRequired,
-  root: PropTypes.object.isRequired,
   settings: PropTypes.object.isRequired,
+  slotPassthrough: PropTypes.object.isRequired,
+  errors: PropTypes.object,
 };
 
 export default TechSettings;
diff --git a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
index c5e1e401a..1bbf0444d 100644
--- a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
@@ -5,6 +5,7 @@ import ModerationSettings from '../components/ModerationSettings';
 import withFragments from 'coral-framework/hocs/withFragments';
 import { getSlotFragmentSpreads } from 'coral-framework/utils';
 import { updatePending } from '../../../actions/configure';
+import { mapProps } from 'recompose';
 
 const slots = ['adminModerationSettings'];
 
@@ -41,5 +42,18 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps)
+  connect(mapStateToProps, mapDispatchToProps),
+  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+    slotPassthrough: {
+      data,
+      root,
+      settings,
+      updatePending,
+      errors,
+    },
+    updatePending,
+    settings,
+    errors,
+    ...rest,
+  }))
 )(ModerationSettings);
diff --git a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
index 24e8ad459..314dfa3ab 100644
--- a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
@@ -5,6 +5,7 @@ import StreamSettings from '../components/StreamSettings';
 import withFragments from 'coral-framework/hocs/withFragments';
 import { getSlotFragmentSpreads } from 'coral-framework/utils';
 import { updatePending } from '../../../actions/configure';
+import { mapProps } from 'recompose';
 
 const slots = ['adminStreamSettings'];
 
@@ -42,5 +43,18 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps)
+  connect(mapStateToProps, mapDispatchToProps),
+  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+    slotPassthrough: {
+      data,
+      root,
+      settings,
+      updatePending,
+      errors,
+    },
+    updatePending,
+    settings,
+    errors,
+    ...rest,
+  }))
 )(StreamSettings);
diff --git a/client/coral-admin/src/routes/Configure/containers/TechSettings.js b/client/coral-admin/src/routes/Configure/containers/TechSettings.js
index c096d1af9..d8a957cbf 100644
--- a/client/coral-admin/src/routes/Configure/containers/TechSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/TechSettings.js
@@ -5,6 +5,7 @@ import TechSettings from '../components/TechSettings';
 import withFragments from 'coral-framework/hocs/withFragments';
 import { getSlotFragmentSpreads } from 'coral-framework/utils';
 import { updatePending } from '../../../actions/configure';
+import { mapProps } from 'recompose';
 
 const slots = ['adminTechSettings'];
 
@@ -38,5 +39,18 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps)
+  connect(mapStateToProps, mapDispatchToProps),
+  mapProps(({ root, settings, data, updatePending, errors, ...rest }) => ({
+    slotPassthrough: {
+      data,
+      root,
+      settings,
+      updatePending,
+      errors,
+    },
+    updatePending,
+    settings,
+    errors,
+    ...rest,
+  }))
 )(TechSettings);
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 3fb3debf5..8a107ac24 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -62,7 +62,6 @@ class Comment extends React.Component {
     } = this.props;
 
     const selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp';
-    const queryData = { root, comment, asset: comment.asset };
 
     const formatterSettings = {
       suspectWords: settings.wordlist.suspect,
@@ -70,6 +69,14 @@ class Comment extends React.Component {
       body: comment.body,
     };
 
+    const slotPassthrough = {
+      data,
+      clearHeightCache,
+      root,
+      comment,
+      asset: comment.asset,
+    };
+
     return (
       <li
         tabIndex={0}
@@ -113,9 +120,7 @@ class Comment extends React.Component {
                 <CommentLabels comment={comment} />
                 <Slot
                   fill="adminCommentInfoBar"
-                  data={data}
-                  clearHeightCache={clearHeightCache}
-                  queryData={queryData}
+                  passthrough={slotPassthrough}
                 />
               </div>
             </div>
@@ -134,13 +139,10 @@ class Comment extends React.Component {
               <div className={styles.body}>
                 <Slot
                   fill="adminCommentContent"
-                  data={data}
                   className={cn(styles.commentContent, 'talk-admin-comment')}
-                  clearHeightCache={clearHeightCache}
-                  queryData={queryData}
                   size={1}
                   defaultComponent={CommentFormatter}
-                  {...formatterSettings}
+                  passthrough={{ ...slotPassthrough, ...formatterSettings }}
                 />
                 <div className={styles.commentContentFooter}>
                   <a
@@ -169,12 +171,7 @@ class Comment extends React.Component {
                     onClick={this.reject}
                   />
                 </div>
-                <Slot
-                  fill="adminSideActions"
-                  data={data}
-                  clearHeightCache={clearHeightCache}
-                  queryData={queryData}
-                />
+                <Slot fill="adminSideActions" passthrough={slotPassthrough} />
               </div>
             </div>
           </CommentAnimatedEdit>
diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 2d9b793ff..615493189 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -148,6 +148,14 @@ class Moderation extends Component {
       count: root[`${queue}Count`],
     }));
 
+    const slotPassthrough = {
+      data,
+      root,
+      asset,
+      activeTab,
+      handleCommentChange,
+    };
+
     return (
       <div>
         <ModerationHeader
@@ -204,13 +212,7 @@ class Moderation extends Component {
           closeSearch={this.closeSearch}
           storySearchChange={this.props.storySearchChange}
         />
-        <Slot
-          data={data}
-          queryData={{ root, asset }}
-          activeTab={activeTab}
-          handleCommentChange={handleCommentChange}
-          fill="adminModeration"
-        />
+        <Slot fill="adminModeration" passthrough={slotPassthrough} />
       </div>
     );
   }
diff --git a/client/coral-admin/src/routes/Moderation/containers/Indicator.js b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
index 1475b6e2d..d1114ebb4 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Indicator.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
@@ -111,14 +111,15 @@ class IndicatorContainer extends Component {
       return null;
     }
 
+    const slotPassthrough = {
+      data: this.props.data,
+      handleCommentChange: this.handleCommentChange,
+    };
+
     return (
       <span>
         <Indicator />
-        <Slot
-          data={this.props.data}
-          handleCommentChange={this.handleCommentChange}
-          fill="adminModerationIndicator"
-        />
+        <Slot fill="adminModerationIndicator" passthrough={slotPassthrough} />
       </span>
     );
   }
diff --git a/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js b/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
index 3c1d0d2af..1117ee562 100644
--- a/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
+++ b/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
@@ -31,15 +31,13 @@ const withViewingOptionsFragments = withFragments({
 const enhance = compose(
   connect(mapStateToProps, mapDispatchToProps),
   withViewingOptionsFragments,
-  mapProps(({ root, asset, data, open, openMenu, closeMenu }) => ({
+  mapProps(({ root, asset, data, ...rest }) => ({
     slotPassthrough: {
       data,
       root,
       asset,
     },
-    open,
-    openMenu,
-    closeMenu,
+    ...rest,
   }))
 );