diff --git a/components/HeroContainer.tsx b/components/HeroContainer.tsx
index 48c27111..552582fb 100644
--- a/components/HeroContainer.tsx
+++ b/components/HeroContainer.tsx
@@ -2,7 +2,12 @@ import { GitHubIcon } from "./GitHubIcon";
 import { HappyCommitsInfo } from "./HappyCommitsInfo";
 import { BinaryCode } from "./BinaryCode";
 
-export const HeroContainer = ({filter, setFilter}) => {
+type FilterProps = {
+  filter: string;
+  setFilter: (filter: string) => void;
+};
+
+export const HeroContainer = ({filter, setFilter}: FilterProps) => {
   return (
     <>
       <div
diff --git a/components/IssueItem.tsx b/components/IssueItem.tsx
index b83fdb53..4650bb56 100644
--- a/components/IssueItem.tsx
+++ b/components/IssueItem.tsx
@@ -1,25 +1,9 @@
-import { faComment } from "@fortawesome/free-regular-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
 import { Issue } from "../types";
 
 type IssueItemProps = {
   issue: Issue;
 };
 
-type IssueCommentNumProps = {
-  numIssues: number;
-};
-
-// const IssueCommentNum = ({ numIssues }: IssueCommentNumProps) => {
-//   return (
-//     <div className="flex flex-row items-center justify-end mt-1 w-10">
-//       <span className="mr-2 text-sm leading-snug">{numIssues}</span>
-//       <FontAwesomeIcon icon={faComment} />
-//     </div>
-//   );
-// };
-
 export const IssueItem = ({ issue }: IssueItemProps) => {
   return (
     <li key={issue.url} className="px-6 py-2 bg-white justify-start items-start gap-4 inline-flex">
@@ -35,7 +19,6 @@ export const IssueItem = ({ issue }: IssueItemProps) => {
         >
           {issue.title}
         </a>
-        {/* {issue.comments_count > 0 && <IssueCommentNum numIssues={issue.comments_count} />} */}
       </div>
     </li>
   );
diff --git a/components/RepositoryMetadata.tsx b/components/RepositoryMetadata.tsx
index 2f4d4699..d03bd9b7 100644
--- a/components/RepositoryMetadata.tsx
+++ b/components/RepositoryMetadata.tsx
@@ -43,7 +43,7 @@ export const RepositoryMetadata = ({
         </div>
         <div className="px-2 py-1 bg-violet-50 rounded justify-center items-center gap-2 flex">
           <div className="text-slate-700 text-[13px] font-normal font-['Source Sans Pro']">
-            SDG-1
+            {repositoryTopics && repositoryTopics.map(topic => topic.display).join(', ')}
           </div>
         </div>
       </div>