diff --git a/src/components/search/form/form.js b/src/components/search/form/form.js
index 7ec79e65..d433d7ca 100644
--- a/src/components/search/form/form.js
+++ b/src/components/search/form/form.js
@@ -241,7 +241,7 @@ export const SearchForm = ({ type=undefined, ...props }) => {
           )
         }
       </Form.Item>
-      { totalConcepts ? (
+      {
         <Form.Item>
           <Tooltip title="Change search type">
             <Radio.Group
@@ -283,7 +283,7 @@ export const SearchForm = ({ type=undefined, ...props }) => {
             />
           </Tooltip>
         </Form.Item>
-      ) : null }
+    }
     </Form>
   )
 }
diff --git a/src/components/search/results/results-header/index.js b/src/components/search/results/results-header/index.js
index 2b8a97f3..c5fe8704 100644
--- a/src/components/search/results/results-header/index.js
+++ b/src/components/search/results/results-header/index.js
@@ -46,19 +46,19 @@ export const ResultsHeader = ({ variables=false, type=FULL, ...props }) => {
         <div className="results-header" {...props}>
             {type === FULL && (
                 <Fragment>
-                <Text>
-                    { variables ? (
-                        `${ variableStudyResultCount } studies and ${ totalVariableResults } variables`
-                    ) : (
-                        `${ totalConcepts } concepts`
+                    <Text>
+                        { variables ? (
+                            `${ variableStudyResultCount } studies and ${ totalVariableResults } variables`
+                        ) : (
+                            `${ totalConcepts } concepts`
+                        ) }
+                    </Text>
+                    { !variables && (
+                        <Tooltip title="Shareable link" placement="top">
+                            {/* Just want anchor styling */}
+                            <Link onClick={NotifyLinkCopied} style={{ marginLeft: '16px', marginRight: '16px' }}><LinkIcon /></Link>
+                        </Tooltip>
                     ) }
-                </Text>
-                { !variables && (
-                    <Tooltip title="Shareable link" placement="top">
-                        {/* Just want anchor styling */}
-                        <Link onClick={NotifyLinkCopied} style={{ marginLeft: '16px', marginRight: '16px' }}><LinkIcon /></Link>
-                    </Tooltip>
-                ) }
                 </Fragment>
             )}
             <div
diff --git a/src/components/search/results/variable-view-layout/variable-view-layout.js b/src/components/search/results/variable-view-layout/variable-view-layout.js
index 44e4c759..854e0753 100644
--- a/src/components/search/results/variable-view-layout/variable-view-layout.js
+++ b/src/components/search/results/variable-view-layout/variable-view-layout.js
@@ -15,18 +15,20 @@ export const VariableViewLayout = () => {
             { isLoadingVariableResults ? (
                 <Spin style={{ display: "block", margin: "32px" }} />
             ) : (
-                <Fragment>
-                    { error.message ? (
-                        <span style={{ marginTop: -144, padding: "0 6px" }}>{ error.message }</span>
-                    ) : query && totalVariableResults === 0 ? (
-                        <Empty style={{ marginTop: -24 }} description={
-                            <Text type="secondary">No results were found for &quot;{ query }&quot;</Text>
-                        } />
-                        // <span style={{ marginTop: -144, padding: "0 6px" }}>No results found</span>
-                    ) : null }
-                    {totalVariableResults > 0 && <ResultsHeader variables={ true } />}
-                    <VariableSearchResults />
-                </Fragment>
+                    query && (
+                        <Fragment>
+                            { error.message ? (
+                                <span style={{ marginTop: -144, padding: "0 6px" }}>{ error.message }</span>
+                            ) : !isLoadingVariableResults && totalVariableResults === 0 ? (
+                                <Empty style={{ marginTop: -24 }} description={
+                                    <Text type="secondary">No results were found for &quot;{ query }&quot;</Text>
+                                } />
+                                // <span style={{ marginTop: -144, padding: "0 6px" }}>No results found</span>
+                            ) : null }
+                            {totalVariableResults > 0 && <ResultsHeader variables={ true } />}
+                            <VariableSearchResults />
+                        </Fragment>
+                    )
             ) }
         </Fragment>
     )