diff --git a/api/functions/graphql/nexus-typegen.ts b/api/functions/graphql/nexus-typegen.ts
index d5efd5f..4161f06 100644
--- a/api/functions/graphql/nexus-typegen.ts
+++ b/api/functions/graphql/nexus-typegen.ts
@@ -203,7 +203,6 @@ export interface NexusGenObjects {
     lnurl_callback_url?: string | null; // String
     screenshots: string[]; // [String!]!
     thumbnail_image: string; // String!
-    title: string; // String!
     votes_count: number; // Int!
     website: string; // String!
   }
diff --git a/api/functions/graphql/types/tournament.js b/api/functions/graphql/types/tournament.js
index f9b400a..a69484f 100644
--- a/api/functions/graphql/types/tournament.js
+++ b/api/functions/graphql/types/tournament.js
@@ -115,8 +115,44 @@ const getMakersInTournament = extendType({
                 search: stringArg(),
                 roleId: intArg(),
             },
-            resolve(_, { tournamentId }) {
-                return []
+            resolve(_, args) {
+
+
+                let filters = [];
+
+                if (args.search) filters.push({
+                    OR: [
+                        {
+                            name: {
+                                contains: args.search,
+                                mode: 'insensitive'
+                            },
+                            jobTitle: {
+                                contains: args.search,
+                                mode: 'insensitive'
+                            }
+                        }
+                    ]
+                })
+
+                if (args.roleId) filters.push({
+                    roles: {
+                        some: {
+                            roleId: args.roleId
+                        }
+                    }
+                })
+
+
+                return prisma.user.findMany({
+                    ...(filters.length > 0 && {
+                        where: {
+                            AND: filters
+                        }
+                    }),
+                    skip: args.skip,
+                    take: args.take,
+                })
             }
         })
     }
diff --git a/src/features/Tournaments/pages/MakersPage/MakerCard/MakerCard.tsx b/src/features/Tournaments/pages/MakersPage/MakerCard/MakerCard.tsx
index 1f21365..3ab8a55 100644
--- a/src/features/Tournaments/pages/MakersPage/MakerCard/MakerCard.tsx
+++ b/src/features/Tournaments/pages/MakersPage/MakerCard/MakerCard.tsx
@@ -33,27 +33,39 @@ export default function MakerCard({ maker, isMe }: Props) {
                 </div>
                 <div className="flex flex-col gap-4 flex-1">
                     <p className="text-body2 text-gray-900 font-bold">{maker.name}</p>
-                    <p className="text-body4 text-gray-600 font-medium">{maker.jobTitle}</p>
-                    <ul className="hidden md:flex flex-wrap gap-8 mt-4">
+                    {maker.jobTitle ? <p className="text-body4 text-gray-600 font-medium">{maker.jobTitle}</p>
+                        :
+                        <p className="text-body4 text-gray-400 font-medium">No job title</p>}
+                    {maker.roles.length ? <ul className="hidden md:flex flex-wrap gap-8 mt-4">
                         {maker.roles.map(role => <li><Badge size='sm' className='!text-body5'>{role.icon} {role.title}</Badge> </li>)}
                     </ul>
+                        :
+                        <p className="hidden md:block text-body4 text-gray-400">No roles added</p>
+                    }
                 </div>
                 {isMe && <span className="ml-auto hidden md:inline-block"><Button color='white' href={createRoute({ type: 'edit-profile' })} size='sm' className='ml-auto'>Edit Profile</Button></span>}
             </div>
             <hr className="hidden md:block bg-gray-200 mt-24"></hr>
 
             <div className="md:hidden mt-24">
-                <p className="text-body5 text-gray-900 font-medium">🌈 Roles</p>
-                <ul className="flex flex-wrap gap-8 mt-12">
+                <p className="text-body5 text-gray-900 font-medium mb-12">🌈 Roles</p>
+
+                {maker.roles.length ? <ul className="flex flex-wrap gap-8">
                     {maker.roles.map(role => <li><Badge size='sm' className='!text-body5'>{role.icon} {role.title}</Badge> </li>)}
                 </ul>
+                    :
+                    <p className="text-body4 text-gray-400">No roles added</p>
+                }
             </div>
 
             <div className="mt-24">
-                <p className="text-body5 text-gray-900 font-medium">🛠️ Skills</p>
-                <ul className="flex flex-wrap gap-8 mt-12">
+                <p className="text-body5 text-gray-900 font-medium mb-12">🛠️ Skills</p>
+                {maker.skills.length ? <ul className="flex flex-wrap gap-8">
                     {maker.skills.map(skill => <li><Badge size='sm' className='!text-body5'>{skill.title}</Badge> </li>)}
                 </ul>
+                    :
+                    <p className="text-body4 text-gray-400">No skills added</p>
+                }
             </div>
             {isMe && <Button fullWidth color='white' href={createRoute({ type: 'edit-profile' })} size='sm' className='mt-32 md:hidden'>Edit Profile</Button>}        </Card>
     )
diff --git a/src/features/Tournaments/pages/MakersPage/MakersPage.tsx b/src/features/Tournaments/pages/MakersPage/MakersPage.tsx
index 3aa1a5b..bc18640 100644
--- a/src/features/Tournaments/pages/MakersPage/MakersPage.tsx
+++ b/src/features/Tournaments/pages/MakersPage/MakersPage.tsx
@@ -83,7 +83,7 @@ export default function MakersPage({ data: { id } }: Props) {
     return (
         <div className='pb-42'>
             <div className="flex flex-col gap-16 lg:gap-24">
-                <MakerCard isMe maker={(query.data?.me ?? query.previousData?.me) as User} />
+                {(query.data?.me ?? query.previousData?.me) && <MakerCard isMe maker={(query.data?.me ?? query.previousData?.me) as User} />}
                 <div className="flex flex-col gap-16">
                     <h3 className="text-body1 text-gray-900 font-bold mt-24">Makers 👾</h3>