diff --git a/src/shared/containers/ResourceListContainer.tsx b/src/shared/containers/ResourceListContainer.tsx
index 5d9e0a117..319d9788b 100644
--- a/src/shared/containers/ResourceListContainer.tsx
+++ b/src/shared/containers/ResourceListContainer.tsx
@@ -1,11 +1,8 @@
 import * as React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useNexusContext } from '@bbp/react-nexus';
-import {
-  DEFAULT_ELASTIC_SEARCH_VIEW_ID,
-  ElasticSearchViewQueryResponse,
-  Resource,
-} from '@bbp/nexus-sdk';
+import { DEFAULT_ELASTIC_SEARCH_VIEW_ID, Resource } from '@bbp/nexus-sdk';
+import { isEmpty } from 'lodash';
 
 import ResourceListComponent, {
   ResourceBoardList,
@@ -152,7 +149,7 @@ const ResourceListContainer: React.FunctionComponent<{
                             '@id': list.query.q,
                           },
                         },
-                      ],
+                      ].filter(query => !isEmpty(query)),
                     },
                   },
                   {
@@ -168,7 +165,7 @@ const ResourceListContainer: React.FunctionComponent<{
                             _self: list.query.q,
                           },
                         },
-                      ],
+                      ].filter(query => !isEmpty(query)),
                     },
                   },
                 ],
diff --git a/src/shared/containers/ResourceViewActionsContainer.tsx b/src/shared/containers/ResourceViewActionsContainer.tsx
index 059a7a3d0..857786669 100644
--- a/src/shared/containers/ResourceViewActionsContainer.tsx
+++ b/src/shared/containers/ResourceViewActionsContainer.tsx
@@ -395,6 +395,64 @@ const ResourceViewActionsContainer: React.FC<{
           {isInCart ? 'Remove from' : 'Add to'} Cart
         </Button>
       </Col>
+      <Col>
+        <Popover
+          destroyTooltipOnHide
+          showArrow={false}
+          key={resource._rev}
+          trigger={['click']}
+          title={
+            <div>
+              <div style={{ fontSize: 16 }}>Tag Resource</div>
+              <i style={{ fontSize: 12 }}>
+                The tag will be applied to revision{' '}
+                <strong>{resource._rev}</strong>
+              </i>
+            </div>
+          }
+          content={
+            <Form<{ tag: string }>
+              autoComplete="off"
+              name="tag-resource-form"
+              initialValues={{ tag: '' }}
+              onFinish={handleTagResource}
+              style={{ width: 300, padding: '8px 8px O' }}
+            >
+              <Form.Item
+                name="tag"
+                rules={[
+                  {
+                    pattern: /^[\x00-\x7F]/,
+                    message: 'Tag should include only ASCII characters.',
+                  },
+                  {
+                    max: 64,
+                    message: 'Tag should not exceed 64 characters.',
+                  },
+                  {
+                    pattern: /^(?!latest$)/,
+                    message:
+                      "Please choose a different name, 'latest' is a reserved word.",
+                  },
+                ]}
+                style={{ marginBottom: 8 }}
+              >
+                <Input placeholder="Resource tag" style={{ width: '100%' }} />
+              </Form.Item>
+              <Form.Item
+                wrapperCol={{ offset: 8, span: 8 }}
+                style={{ marginBottom: 0 }}
+              >
+                <Button type="primary" htmlType="submit">
+                  Confirm
+                </Button>
+              </Form.Item>
+            </Form>
+          }
+        >
+          <Button>Tag Resource</Button>
+        </Popover>
+      </Col>
       <Col>
         <Popover
           destroyTooltipOnHide