Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Event.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Event.java	(revision ed8f998c7f8efaf2ed29eec2f7f06b1b9650cfbb)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Event.java	(revision 765e166b79bd65b570078fd2d0b5b84754b04258)
@@ -36,11 +36,5 @@
     @ManyToOne(fetch = FetchType.LAZY)
     @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name = "creator_artist_id")
-    private Artist creatorArtist;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name = "creator_admin_id")
-    private Admin creatorAdmin;
-
+    @JoinColumn(name = "creator_id")
+    private User creatorUser;
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision ed8f998c7f8efaf2ed29eec2f7f06b1b9650cfbb)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision 765e166b79bd65b570078fd2d0b5b84754b04258)
@@ -80,20 +80,30 @@
 
     @Query("""
-        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.SongDto(
-            s.id,
-            s.musicalEntities.title,
-            s.musicalEntities.genre,
-            'SONG',
-            s.musicalEntities.releasedBy.nonAdminUser.user.fullName,
-            s.musicalEntities.releasedBy.nonAdminUser.user.username,
-            s.musicalEntities.cover,
-            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId)),
-            s.album.musicalEntities.title,
-            s.album.musicalEntities.id,
-            s.link
-        )
-        FROM Song s
-        WHERE s.musicalEntities.title ILIKE '%' || :searchTerm || '%'
-    """)
+    SELECT NEW com.ukim.finki.develop.finkwave.model.dto.SongDto(
+        s.id,
+        me.title,
+        me.genre,
+        'SONG',
+        u.fullName,
+        u.username,
+        me.cover,
+        (EXISTS (
+            SELECT 1 FROM Like l
+            WHERE l.musicalEntity.id = s.id
+              AND l.listener.id = :currentUserId
+        )),
+        albumMe.title,
+        a.id,
+        s.link
+    )
+    FROM Song s
+    JOIN s.musicalEntities me
+    JOIN me.releasedBy rb
+    JOIN rb.nonAdminUser nau
+    JOIN nau.user u
+    LEFT JOIN s.album a
+    LEFT JOIN a.musicalEntities albumMe
+    WHERE me.title ILIKE CONCAT('%', :searchTerm, '%')
+""")
     List<SongDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);