Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java	(revision b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -32,5 +32,5 @@
     public HttpEntity<List<MusicalEntityDto>> searchSongs(
             @RequestParam(name = "q") String searchTerm){
-        return ResponseEntity.ok(songService.searchSongs(null, searchTerm));
+        return ResponseEntity.ok(songService.searchSongs(searchTerm));
     }
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java	(revision b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -17,4 +17,5 @@
     private String cover;
     private Boolean isLikedByCurrentUser;
+    private String album;
 
     public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, Boolean isLikedByCurrentUser) {
@@ -26,3 +27,13 @@
         this.isLikedByCurrentUser = isLikedByCurrentUser;
     }
+
+    public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser) {
+        this.id = id;
+        this.title = title;
+        this.genre = genre;
+        this.type = type;
+        this.releasedBy = releasedBy;
+        this.cover = cover;
+        this.isLikedByCurrentUser = isLikedByCurrentUser;
+    }
 }
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 b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -49,14 +49,16 @@
     @Query("""
         SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
-        s.id, me.title, me.genre, 'SONG', u.fullName, me.cover,
-            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId))
+            s.id,
+            s.musicalEntities.title,
+            s.musicalEntities.genre,
+            'SONG',
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName,
+            s.musicalEntities.cover,
+            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId)),
+            s.album.musicalEntities.title
         )
         FROM Song s
-        JOIN s.musicalEntities me
-        JOIN me.releasedBy a
-        JOIN a.nonAdminUser nau
-        JOIN nau.user u
-        JOIN Listen l on l.song.id = s.id
-        GROUP BY s.id, me.title, me.genre, u.fullName, me.cover
+        GROUP BY s.id, s.musicalEntities.title, s.musicalEntities.genre,
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName, s.musicalEntities.cover, s.album.musicalEntities.title
         ORDER BY count(*) desc
     """)
@@ -64,14 +66,16 @@
     List<MusicalEntityDto> findTopByListens(@Param("currentUserId")Long currentUserId);
 
-    // todo: fix is liked by user, currently returns hard coded false
     @Query("""
         SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
-            s.id, me.title, me.genre, 'SONG', u.fullName, me.cover, FALSE )
+            s.id,
+            s.musicalEntities.title,
+            s.musicalEntities.genre,
+            'SONG',
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName,
+            s.musicalEntities.cover,
+            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId))
+        )
         FROM Song s
-        JOIN s.musicalEntities me
-        JOIN me.releasedBy a
-        JOIN a.nonAdminUser nau
-        JOIN nau.user u
-        WHERE me.title ILIKE '%' || :searchTerm || '%'
+        WHERE s.musicalEntities.title ILIKE '%' || :searchTerm || '%'
     """)
     List<MusicalEntityDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java	(revision b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -19,5 +19,6 @@
     }
 
-    public List<MusicalEntityDto> searchSongs(Long userId, String searchTerm){
+    public List<MusicalEntityDto> searchSongs(String searchTerm){
+        Long userId = authService.getCurrentUserID();
         return songRepository.searchSongs(userId, searchTerm);
     }
Index: frontend/src/pages/LandingPage.tsx
===================================================================
--- frontend/src/pages/LandingPage.tsx	(revision b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ frontend/src/pages/LandingPage.tsx	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -350,5 +350,5 @@
 													</h3>
 													<p className="text-sm text-gray-400 mb-3 overflow-hidden text-ellipsis whitespace-nowrap">
-														{"<album>"}
+														{song.album}
 													</p>
 													<p className="text-sm text-gray-400 mb-3 overflow-hidden text-ellipsis whitespace-nowrap">
Index: frontend/src/utils/types.ts
===================================================================
--- frontend/src/utils/types.ts	(revision b071fb4a2344e233ee12641fe437797ae1bbb736)
+++ frontend/src/utils/types.ts	(revision 591919dcbfc8cdaa28d9cb3a0ab779f85b9a104f)
@@ -28,4 +28,5 @@
 export interface Song extends MusicalEntity {
 	type: "SONG";
+	album?: string;
 }