diff --git a/src/jobs/jobs.service.ts b/src/jobs/jobs.service.ts
index 888e6ddb..7eb4d63e 100644
--- a/src/jobs/jobs.service.ts
+++ b/src/jobs/jobs.service.ts
@@ -404,7 +404,7 @@ export class JobsService {
             MATCH (jp)-[:HAS_STATUS]->(:JobpostOnlineStatus)
             MATCH (j)-[:HAS_CLASSIFICATION]-(cat:JobpostClassification)
             MATCH (j)-[:HAS_LOCATION_TYPE]-(l:JobpostLocationType)
-            OPTIONAL MATCH (j)-[:HAS_TAG]->(t:JobpostTag)
+            OPTIONAL MATCH (j)-[:HAS_TAG]->(t:Tag)
             OPTIONAL MATCH (o)-[:HAS_FUNDING_ROUND]->(f:FundingRound)-[:INVESTED_BY]->(i:Investor)
             OPTIONAL MATCH (o)-[:HAS_PROJECT]->(p:Project)
             OPTIONAL MATCH (p)-[:IS_DEPLOYED_ON_CHAIN]->(c:Chain)
diff --git a/src/organizations/organizations.service.ts b/src/organizations/organizations.service.ts
index da0f65b7..42e4a997 100644
--- a/src/organizations/organizations.service.ts
+++ b/src/organizations/organizations.service.ts
@@ -77,7 +77,7 @@ export class OrganizationsService {
               ]
             }
           ],
-          tags: [(organization)-[:HAS_JOBSITE|HAS_JOBPOST|HAS_STRUCTURED_JOBPOST|HAS_TAG*4]->(tag: JobpostTag) WHERE NOT (tag)<-[:IS_BLOCKED_TERM]-() | tag { .* }]
+          tags: [(organization)-[:HAS_JOBSITE|HAS_JOBPOST|HAS_STRUCTURED_JOBPOST|HAS_TAG*4]->(tag: Tag) WHERE NOT (tag)<-[:IS_BLOCKED_TERM]-() | tag { .* }]
         } as res
         `;
 
diff --git a/src/shared/models/project.model.ts b/src/shared/models/project.model.ts
index cb297bbd..5389ddba 100644
--- a/src/shared/models/project.model.ts
+++ b/src/shared/models/project.model.ts
@@ -447,7 +447,7 @@ export const Projects = (
                       locationType: [(structured_jobpost)-[:HAS_LOCATION_TYPE]->(locationType) | locationType.name ][0]
                     }
                   ],
-                  tags: [(organization)-[:HAS_JOBSITE|HAS_JOBPOST|HAS_STRUCTURED_JOBPOST|HAS_TAG*4]->(tag: JobpostTag) WHERE NOT (tag)<-[:IS_BLOCKED_TERM]-() | tag { .* }]
+                  tags: [(organization)-[:HAS_JOBSITE|HAS_JOBPOST|HAS_STRUCTURED_JOBPOST|HAS_TAG*4]->(tag: Tag) WHERE NOT (tag)<-[:IS_BLOCKED_TERM]-() | tag { .* }]
                 },
                 hacks: [
                 (project)-[:HAS_HACK]->(hack) | hack { .* }