diff --git a/lang/default.json b/lang/default.json
index e1658a2b1c..a8442a1b2e 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -167,6 +167,10 @@
     "defaultMessage": "Next Step",
     "description": ""
   },
+  "8w3GEA": {
+    "defaultMessage": "mentioned you in {article}",
+    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+  },
   "8xPi0N": {
     "defaultMessage": "Unsubscribe Circle",
     "description": "src/views/Circle/Profile/DropdownActions/index.tsx"
@@ -567,10 +571,6 @@
     "defaultMessage": "The original login via email will be kept for you. Please note that your wallet cannot be reset once it is connected because of your account security.",
     "description": "src/components/Forms/WalletAuthForm/Select.tsx"
   },
-  "UgvfcU": {
-    "defaultMessage": "You have successfully completed Ethereum wallet settings. Please confirm wallet address:",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
-  },
   "UjKkhq": {
     "defaultMessage": "Tags added",
     "description": "src/views/TagDetail/DropdownActions/index.tsx"
@@ -1007,10 +1007,6 @@
     "defaultMessage": "Circle Name",
     "description": ""
   },
-  "qQmSxu": {
-    "defaultMessage": "Airdrop registration completed. Your NFT will be revealed on November 12. Confirm your ETH wallet address:",
-    "description": "src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
-  },
   "qYzBk8": {
     "defaultMessage": "unsubscribed your circle",
     "description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
@@ -1063,10 +1059,6 @@
     "defaultMessage": "Log in",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": "mentioned you in an article",
-    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
-  },
   "stjoBH": {
     "defaultMessage": "Now, go like the authors you support! Your Likes will become their income",
     "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
diff --git a/lang/en.json b/lang/en.json
index a8bebfafcf..c41800e648 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -423,8 +423,8 @@
     "defaultMessage": "Your work {articleTitle} has been published to decentralized network",
     "description": "src/components/Notice/ArticleNotice/ArticlePublishedNotice.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " mentioned you in an article",
+  "8w3GEA": {
+    "defaultMessage": "mentioned you in {article}",
     "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
   "CD688y": {
@@ -435,7 +435,7 @@
     "defaultMessage": "etc. {actorsCount} users",
     "description": "src/components/Notice/ArticleNotice/ArticleNewSubscriberNotice.tsx"
   },
-  "PjT72J": {
+  "p5qZnJ": {
     "defaultMessage": "liked",
     "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
   },
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 21ca7eb9af..fc94b81f9a 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -1107,8 +1107,8 @@
     "defaultMessage": "登入",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " 在作品中提及你",
+  "8w3GEA": {
+    "defaultMessage": "在作品 {article} 中提及你",
     "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
   "stjoBH": {
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 6c62c39d30..dcac1c3505 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -1111,8 +1111,8 @@
     "defaultMessage": "登录",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "sncOwi": {
-    "defaultMessage": " 在作品中提及你",
+  "8w3GEA": {
+    "defaultMessage": "在作品 {article} 中提及你",
     "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
   },
   "stjoBH": {
diff --git a/package-lock.json b/package-lock.json
index f81962fb24..f9d90f5bc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "matters-web",
-  "version": "4.21.0",
+  "version": "4.22.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "matters-web",
-      "version": "4.21.0",
+      "version": "4.22.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@apollo/react-common": "^3.1.3",
diff --git a/package.json b/package.json
index cd89e28e2c..38db3cee0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "4.22.0",
+  "version": "4.22.1",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <hi@matters.town>",
diff --git a/src/common/gql/fragmentTypes.json b/src/common/gql/fragmentTypes.json
index 5e275b3f35..0cd153dc52 100644
--- a/src/common/gql/fragmentTypes.json
+++ b/src/common/gql/fragmentTypes.json
@@ -19,7 +19,6 @@
           { "name": "TagNotice" },
           { "name": "TransactionNotice" },
           { "name": "CircleNotice" },
-          { "name": "CryptoNotice" },
           { "name": "OfficialAnnouncementNotice" }
         ]
       },
diff --git a/src/common/styles/variables/typography.css b/src/common/styles/variables/typography.css
index cb1bf964e4..ad81c0c781 100644
--- a/src/common/styles/variables/typography.css
+++ b/src/common/styles/variables/typography.css
@@ -3,11 +3,11 @@
 :root {
   /* Font Stack */
   --font-sans-tc: -apple-system, blinkmacsystemfont, 'Helvetica Neue',
-    'Segoe UI', roboto, arial, 'PingFang TC', 'Microsoft YaHei',
-    'Source Han Sans TC', 'Noto Sans CJK TC', 'WenQuanYi Micro Hei', sans-serif;
+    'Segoe UI', roboto, arial, 'PingFang TC', 'Source Han Sans TC',
+    'Noto Sans CJK TC', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
   --font-sans-sc: -apple-system, blinkmacsystemfont, 'Helvetica Neue',
-    'Segoe UI', roboto, arial, 'PingFang SC', 'Microsoft YaHei',
-    'Source Han Sans SC', 'Noto Sans CJK SC', 'WenQuanYi Micro Hei', sans-serif;
+    'Segoe UI', roboto, arial, 'PingFang SC', 'Source Han Sans SC',
+    'Noto Sans CJK SC', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
   --font-serif-tc: 'Noto Serif', 'Noto Serif CJK TC', 'Source Han Serif TC',
     'Songti TC', serif;
   --font-serif-sc: 'Noto Serif', 'Noto Serif CJK SC', 'Source Han Serif SC',
diff --git a/src/components/DateTime/index.tsx b/src/components/DateTime/index.tsx
index 2604776c34..43a25c539b 100644
--- a/src/components/DateTime/index.tsx
+++ b/src/components/DateTime/index.tsx
@@ -1,3 +1,4 @@
+import classNames from 'classnames'
 import React, { useContext } from 'react'
 
 import { datetimeFormat } from '~/common/utils'
@@ -7,6 +8,7 @@ import styles from './styles.css'
 
 interface DateTimeProps {
   date: Date | string | number
+  color?: 'grey' | 'grey-dark'
   type?: 'absolute' | 'relative' | 'standard'
 }
 
@@ -26,11 +28,18 @@ interface DateTimeProps {
  * ```
  */
 
-const BaseDateTime = ({ date, type = 'absolute' }: DateTimeProps) => {
+const BaseDateTime = ({
+  date,
+  type = 'absolute',
+  color = 'grey-dark',
+}: DateTimeProps) => {
   const { lang } = useContext(LanguageContext)
+  const timeclasses = classNames({
+    [color || '']: !!color,
+  })
 
   return (
-    <time dateTime={new Date(date).toISOString()}>
+    <time dateTime={new Date(date).toISOString()} className={timeclasses}>
       {datetimeFormat[type](date, lang)}
 
       <style jsx>{styles}</style>
diff --git a/src/components/DateTime/styles.css b/src/components/DateTime/styles.css
index 1bf465ab07..c2a246322b 100644
--- a/src/components/DateTime/styles.css
+++ b/src/components/DateTime/styles.css
@@ -5,3 +5,11 @@ time {
   color: var(--color-grey-dark);
   white-space: nowrap;
 }
+
+.grey {
+  color: var(--color-grey);
+}
+
+.grey-dark {
+  color: var(--color-grey-dark);
+}
diff --git a/src/components/Head/index.tsx b/src/components/Head/index.tsx
index 8ccbf8ea9c..121d5012fb 100644
--- a/src/components/Head/index.tsx
+++ b/src/components/Head/index.tsx
@@ -49,7 +49,7 @@ export const Head: React.FC<HeadProps> = (props) => {
       ? `${props.keywords.join(',')},matters,${
           process.env.NEXT_PUBLIC_SITE_DOMAIN
         },創作有價`
-      : 'matters,${process.env.NEXT_PUBLIC_SITE_DOMAIN},創作有價',
+      : `matters,${process.env.NEXT_PUBLIC_SITE_DOMAIN},創作有價`,
     url: props.path
       ? `https://${siteDomain}${props.path}`
       : `https://${siteDomain}${router.asPath || '/'}`,
@@ -66,7 +66,7 @@ export const Head: React.FC<HeadProps> = (props) => {
     props.jsonLdData.description = head.description
   }
 
-  const canonicalUrl = head.url?.split('?')[0]
+  const canonicalUrl = head.url?.split('#')[0].split('?')[0]
 
   return (
     <NextHead>
@@ -107,7 +107,9 @@ export const Head: React.FC<HeadProps> = (props) => {
         type="application/opensearchdescription+xml"
         key="opensearch"
       />
-      <link rel="canonical" href={canonicalUrl} key="canonical" />
+      {props.path && (
+        <link rel="canonical" href={canonicalUrl} key="canonical" />
+      )}
       {props.paymentPointer && (
         <meta name="monetization" content={props.paymentPointer} />
       )}
diff --git a/src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx b/src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx
index 5924867a26..67f9912068 100644
--- a/src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx
+++ b/src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx
@@ -7,46 +7,29 @@ import { ArticleMentionedYouNoticeFragment } from '~/gql/graphql'
 import NoticeActorAvatar from '../NoticeActorAvatar'
 import NoticeActorName from '../NoticeActorName'
 import NoticeArticleCard from '../NoticeArticleCard'
+import NoticeArticleTitle from '../NoticeArticleTitle'
 import NoticeDate from '../NoticeDate'
-import NoticeHead from '../NoticeHead'
-import styles from '../styles.css'
+import NoticeDigest from '../NoticeDigest'
 
 const ArticleMentionedYouNotice = ({
   notice,
 }: {
   notice: ArticleMentionedYouNoticeFragment
 }) => {
-  if (!notice.actors) {
-    return null
-  }
-
-  const actor = notice.actors[0]
-
   return (
-    <section
-      className="container"
-      data-test-id={TEST_ID.NOTICE_ARTICLE_MENTIONED_YOU}
-    >
-      <section className="avatar-wrap">
-        <NoticeActorAvatar user={actor} />
-      </section>
-
-      <section className="content-wrap">
-        <NoticeHead>
-          <NoticeActorName user={actor} />
-          <FormattedMessage
-            defaultMessage="mentioned you in an article"
-            description="src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
-          />
-        </NoticeHead>
-
-        <NoticeArticleCard article={notice.article} />
-
-        <NoticeDate notice={notice} />
-      </section>
-
-      <style jsx>{styles}</style>
-    </section>
+    <NoticeDigest
+      notice={notice}
+      action={
+        <FormattedMessage
+          defaultMessage="mentioned you in {article}"
+          description="src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+          values={{
+            article: <NoticeArticleTitle article={notice.article} />,
+          }}
+        />
+      }
+      testId={TEST_ID.NOTICE_ARTICLE_MENTIONED_YOU}
+    />
   )
 }
 
diff --git a/src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx b/src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx
deleted file mode 100644
index fb66a9f598..0000000000
--- a/src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import gql from 'graphql-tag'
-import { FormattedMessage } from 'react-intl'
-
-import { TEST_ID } from '~/common/enums'
-import { CryptoWalletAirdropNoticeFragment } from '~/gql/graphql'
-
-import NoticeDate from '../NoticeDate'
-import NoticeTypeIcon from '../NoticeTypeIcon'
-import styles from '../styles.css'
-
-const CryptoWalletAirdropNotice = ({
-  notice,
-}: {
-  notice: CryptoWalletAirdropNoticeFragment
-}) => {
-  return (
-    <section
-      className="container"
-      data-test-id={TEST_ID.NOTICE_CRYPTO_WALLET_AIRDROP}
-    >
-      <section className="avatar-wrap">
-        <NoticeTypeIcon type="volume" />
-      </section>
-
-      <section className="content-wrap">
-        <p>
-          <FormattedMessage
-            defaultMessage="Airdrop registration completed. Your NFT will be revealed on November 12. Confirm your ETH wallet address:"
-            description="src/components/Notice/CryptoNotice/CryptoWalletAirdropNotice.tsx"
-          />
-        </p>
-        <p className="highlight">{notice.target.address}</p>
-        <NoticeDate notice={notice} />
-      </section>
-
-      <style jsx>{styles}</style>
-    </section>
-  )
-}
-
-CryptoWalletAirdropNotice.fragments = {
-  notice: gql`
-    fragment CryptoWalletAirdropNotice on CryptoNotice {
-      __typename
-      id
-      unread
-      type
-      target {
-        address
-      }
-      ...NoticeDate
-    }
-  `,
-}
-
-export default CryptoWalletAirdropNotice
diff --git a/src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx b/src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx
deleted file mode 100644
index 017e064f63..0000000000
--- a/src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import gql from 'graphql-tag'
-import { FormattedMessage } from 'react-intl'
-
-import { TEST_ID } from '~/common/enums'
-import { CryptoWalletConnectedNoticeFragment } from '~/gql/graphql'
-
-import NoticeDate from '../NoticeDate'
-import NoticeTypeIcon from '../NoticeTypeIcon'
-import styles from '../styles.css'
-
-const CryptoWalletConnectedNotice = ({
-  notice,
-}: {
-  notice: CryptoWalletConnectedNoticeFragment
-}) => {
-  return (
-    <section
-      className="container"
-      data-test-id={TEST_ID.NOTICE_CRYPTO_WALLET_CONNECTED}
-    >
-      <section className="avatar-wrap">
-        <NoticeTypeIcon type="volume" />
-      </section>
-
-      <section className="content-wrap">
-        <p>
-          <FormattedMessage
-            defaultMessage="You have successfully completed Ethereum wallet settings. Please confirm wallet address:"
-            description="src/components/Notice/CryptoNotice/CryptoWalletConnectedNotice.tsx"
-          />
-          <p className="highlight">{notice.target.address}</p>
-        </p>
-        <NoticeDate notice={notice} />
-      </section>
-
-      <style jsx>{styles}</style>
-    </section>
-  )
-}
-
-CryptoWalletConnectedNotice.fragments = {
-  notice: gql`
-    fragment CryptoWalletConnectedNotice on CryptoNotice {
-      __typename
-      id
-      unread
-      type
-      target {
-        address
-      }
-      ...NoticeDate
-    }
-  `,
-}
-
-export default CryptoWalletConnectedNotice
diff --git a/src/components/Notice/CryptoNotice/index.tsx b/src/components/Notice/CryptoNotice/index.tsx
deleted file mode 100644
index 130c87d57d..0000000000
--- a/src/components/Notice/CryptoNotice/index.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import gql from 'graphql-tag'
-
-import { CryptoNoticeFragment } from '~/gql/graphql'
-
-import CryptoWalletAirdropNotice from './CryptoWalletAirdropNotice'
-import CryptoWalletConnectedNotice from './CryptoWalletConnectedNotice'
-
-const CryptoNotice = ({ notice }: { notice: CryptoNoticeFragment }) => {
-  switch (notice.type) {
-    case 'CryptoWalletAirdrop':
-      return <CryptoWalletAirdropNotice notice={notice} />
-    case 'CryptoWalletConnected':
-      return <CryptoWalletConnectedNotice notice={notice} />
-    default:
-      return null
-  }
-}
-
-CryptoNotice.fragments = {
-  notice: gql`
-    fragment CryptoNotice on CryptoNotice {
-      __typename
-      id
-      unread
-      type
-      ...CryptoWalletAirdropNotice
-      ...CryptoWalletConnectedNotice
-    }
-    ${CryptoWalletAirdropNotice.fragments.notice}
-    ${CryptoWalletConnectedNotice.fragments.notice}
-  `,
-}
-
-export default CryptoNotice
diff --git a/src/components/Notice/NoticeActorsNameAndTitle.tsx b/src/components/Notice/NoticeActorsNameAndTitle.tsx
index 86bacf99d0..2f7504fbd2 100644
--- a/src/components/Notice/NoticeActorsNameAndTitle.tsx
+++ b/src/components/Notice/NoticeActorsNameAndTitle.tsx
@@ -54,10 +54,10 @@ const NoticeActorsNameAndTitle = ({
               &nbsp;
               <Translate zh_hant="人" zh_hans="人" en="users" />
             </span>
+            {action}
           </>
         )}
-        &nbsp;
-        {action}
+        {!isMoreActors && <>&nbsp;{action}</>}
       </span>
       {!!title && (
         <span className="notice-actors-name-and-title-title">
diff --git a/src/components/Notice/NoticeDate.tsx b/src/components/Notice/NoticeDate.tsx
index 829dcc4c58..469ecc6e94 100644
--- a/src/components/Notice/NoticeDate.tsx
+++ b/src/components/Notice/NoticeDate.tsx
@@ -7,7 +7,7 @@ import styles from './styles.css'
 
 const NoticeDate = ({ notice }: { notice: NoticeDateFragment }) => (
   <section className="date">
-    <DateTime date={notice.createdAt} type="relative" />
+    <DateTime date={notice.createdAt} type="relative" color="grey" />
 
     <style jsx>{styles}</style>
   </section>
diff --git a/src/components/Notice/index.tsx b/src/components/Notice/index.tsx
index 7f27511458..ba26533bd3 100644
--- a/src/components/Notice/index.tsx
+++ b/src/components/Notice/index.tsx
@@ -9,7 +9,6 @@ import ArticleTagNotice from './ArticleTagNotice'
 import CircleNotice from './CircleNotice'
 import CommentCommentNotice from './CommentCommentNotice'
 import CommentNotice from './CommentNotice'
-import CryptoNotice from './CryptoNotice'
 import OfficialAnnouncementNotice from './OfficialAnnouncementNotice'
 import TagNotice from './TagNotice'
 import TransactionNotice from './TransactionNotice'
@@ -49,9 +48,6 @@ const fragments = {
       ... on CircleNotice {
         ...CircleNotice
       }
-      ... on CryptoNotice {
-        ...CryptoNotice
-      }
       ... on OfficialAnnouncementNotice {
         ...OfficialAnnouncementNotice
       }
@@ -65,7 +61,6 @@ const fragments = {
     ${TagNotice.fragments.notice}
     ${TransactionNotice.fragments.notice}
     ${CircleNotice.fragments.notice}
-    ${CryptoNotice.fragments.notice}
     ${OfficialAnnouncementNotice.fragments.notice}
   `,
 }
@@ -94,7 +89,6 @@ export const Notice: React.FC<NoticeProps> & {
       return <CircleNotice notice={notice} />
     case 'OfficialAnnouncementNotice':
       return <OfficialAnnouncementNotice notice={notice} />
-    case 'CryptoNotice':
     default:
       return null
   }
diff --git a/src/components/Notice/styles.css b/src/components/Notice/styles.css
index 4458c11d7c..7e059e4716 100644
--- a/src/components/Notice/styles.css
+++ b/src/components/Notice/styles.css
@@ -157,6 +157,7 @@
 
   padding-left: var(--spacing-tight);
   margin-left: var(--spacing-xx-loose);
+  color: var(--color-black);
   text-overflow: ellipsis;
   border-left-style: dashed;
   -webkit-line-clamp: 3;
diff --git a/src/components/Search/SearchBar/index.tsx b/src/components/Search/SearchBar/index.tsx
index 2d8adcc5ef..5130a0ce73 100644
--- a/src/components/Search/SearchBar/index.tsx
+++ b/src/components/Search/SearchBar/index.tsx
@@ -203,6 +203,8 @@ export const SearchBar: React.FC<SearchBarProps> = ({
               action=""
             >
               <input
+                // FIMXME: FOUC on re-render
+                style={{ borderColor: 'var(--color-line-grey-light)' }}
                 type="search"
                 name="q"
                 ref={searchTextInput}
@@ -218,6 +220,7 @@ export const SearchBar: React.FC<SearchBarProps> = ({
               />
 
               <SearchButton />
+
               {search.length > 0 && (
                 <ClearButton
                   onClick={() => {
@@ -262,6 +265,8 @@ export const SearchBar: React.FC<SearchBarProps> = ({
           >
             <form onSubmit={handleSubmit} autoComplete="off" action="">
               <input
+                // FIMXME: FOUC on re-render
+                style={{ borderColor: 'var(--color-line-grey-light)' }}
                 type="search"
                 name="q"
                 ref={searchTextInput}
diff --git a/src/components/Search/SearchBar/styles.css b/src/components/Search/SearchBar/styles.css
index 999a2727ea..92f3b2ee6f 100644
--- a/src/components/Search/SearchBar/styles.css
+++ b/src/components/Search/SearchBar/styles.css
@@ -26,7 +26,7 @@ form {
     transition-property: border-color, background-color;
 
     &:focus {
-      border: 1px solid var(--color-matters-green);
+      border: 1px solid var(--color-matters-green) !important;
     }
 
     &::placeholder {
diff --git a/src/components/Search/SearchQuickResult/gql.ts b/src/components/Search/SearchQuickResult/gql.ts
index 1e3625865e..6293954c27 100644
--- a/src/components/Search/SearchQuickResult/gql.ts
+++ b/src/components/Search/SearchQuickResult/gql.ts
@@ -6,7 +6,13 @@ import { UserDigest } from '~/components/UserDigest'
 export const QUICK_RESULT = gql`
   query QuickResult($key: String!) {
     user: search(
-      input: { type: User, quicksearch: true, first: 5, key: $key }
+      input: {
+        type: User
+        quicksearch: true
+        record: true
+        first: 5
+        key: $key
+      }
     ) {
       edges {
         cursor
@@ -17,7 +23,9 @@ export const QUICK_RESULT = gql`
         }
       }
     }
-    tag: search(input: { type: Tag, quicksearch: true, first: 5, key: $key }) {
+    tag: search(
+      input: { type: Tag, quicksearch: true, record: true, first: 5, key: $key }
+    ) {
       edges {
         cursor
         node {
diff --git a/src/stories/components/Notices/mock.ts b/src/stories/components/Notices/mock.ts
index 9136c0d46c..41cd4b4ecb 100644
--- a/src/stories/components/Notices/mock.ts
+++ b/src/stories/components/Notices/mock.ts
@@ -4,7 +4,6 @@ import {
   MOCK_CIRCLE_ARTICLE,
   MOCK_CIRCLE_COMMENT,
   MOCK_COMMENT,
-  MOCK_CRYPTO_WALLET,
   MOCK_PARENT_COMMENT,
   MOCK_TAG,
   MOCK_TRANSACTION,
@@ -404,26 +403,6 @@ export const MOCK_NOTICE_LIST = [
     circle: MOCK_CIRCLE,
   },
 
-  // CryptoWalletAirdrop
-  {
-    __typename: 'CryptoNotice' as any,
-    id: 'CryptoWalletAirdrop',
-    unread: false,
-    createdAt: '2021-10-26T07:29:17.682Z',
-    type: 'CryptoWalletAirdrop' as any,
-    target: MOCK_CRYPTO_WALLET,
-  },
-
-  // CryptoWalletConnected
-  {
-    __typename: 'CryptoNotice' as any,
-    id: 'CryptoWalletConnected',
-    unread: false,
-    createdAt: '2021-10-26T07:29:17.682Z',
-    type: 'CryptoWalletConnected' as any,
-    target: MOCK_CRYPTO_WALLET,
-  },
-
   /**
    * Misc
    */
diff --git a/src/views/Search/AggregateResults/gql.ts b/src/views/Search/AggregateResults/gql.ts
index bd62e8ba3d..a091bb6f68 100644
--- a/src/views/Search/AggregateResults/gql.ts
+++ b/src/views/Search/AggregateResults/gql.ts
@@ -8,7 +8,15 @@ export const SEARCH_AGGREGATE_ARTICLES_PUBLIC = gql`
     $first: first_Int_min_0 = 30
     $after: String
   ) {
-    search(input: { type: Article, first: $first, key: $key, after: $after }) {
+    search(
+      input: {
+        type: Article
+        record: true
+        first: $first
+        key: $key
+        after: $after
+      }
+    ) {
       pageInfo {
         startCursor
         endCursor
@@ -33,7 +41,15 @@ export const SEARCH_AGGREGATE_TAGS_PUBLIC = gql`
     $first: first_Int_min_0 = 30
     $after: String
   ) {
-    search(input: { type: Tag, first: $first, key: $key, after: $after }) {
+    search(
+      input: {
+        type: Tag
+        record: true
+        first: $first
+        key: $key
+        after: $after
+      }
+    ) {
       pageInfo {
         startCursor
         endCursor
@@ -58,7 +74,15 @@ export const SEARCH_AGGREGATE_USERS_PUBLIC = gql`
     $first: first_Int_min_0 = 30
     $after: String
   ) {
-    search(input: { type: User, first: $first, key: $key, after: $after }) {
+    search(
+      input: {
+        type: User
+        record: true
+        first: $first
+        key: $key
+        after: $after
+      }
+    ) {
       pageInfo {
         startCursor
         endCursor