diff --git a/src/components/RepositoryMetadata/RepositoryMetadata.tsx b/src/components/RepositoryMetadata/RepositoryMetadata.tsx
index d7f74bf59..669a538f1 100644
--- a/src/components/RepositoryMetadata/RepositoryMetadata.tsx
+++ b/src/components/RepositoryMetadata/RepositoryMetadata.tsx
@@ -14,6 +14,9 @@ type Props = {
 function RepositoryMetadata({ repo }: Props) {
 
   const detailUrl = () => {
+    if (repo.clientId)
+      return `/repositories/${repo.clientId}`
+
     return `/repositories/${repo.id}`
   }
 
diff --git a/src/data/queries/searchRepositoryQuery.ts b/src/data/queries/searchRepositoryQuery.ts
index 08ac6310c..37833ba4f 100644
--- a/src/data/queries/searchRepositoryQuery.ts
+++ b/src/data/queries/searchRepositoryQuery.ts
@@ -7,7 +7,7 @@ import { mapJsonToRepository } from 'src/utils/helpers'
 
 function buildRepositorySearchParams(variables: QueryVar): URLSearchParams {
   const searchParams = new URLSearchParams({
-    query: variables.query,
+    query: [variables.query, "client_id:*"].filter(Boolean).join(' AND '),
   })
 
   function optionalAppend(param: string, value: string | undefined) {