Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/AlbumRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/AlbumRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/AlbumRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -16,16 +16,14 @@
     List<Album>findAllByIdIn(List<Long>ids);
 
-
     @Query("""
-            SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
             a.id, me.title, me.genre, 'ALBUM', u.fullName, me.cover, FALSE )
-            FROM Album a
-            JOIN a.musicalEntities me
-            JOIN me.releasedBy rb
-            JOIN rb.nonAdminUser nau
-            JOIN nau.user u
-            WHERE me.title ILIKE %:searchTerm%
-            """
-    )
+        FROM Album a
+        JOIN a.musicalEntities me
+        JOIN me.releasedBy rb
+        JOIN rb.nonAdminUser nau
+        JOIN nau.user u
+        WHERE me.title ILIKE '%' || :searchTerm || '%'
+    """)
     List<MusicalEntityDto> searchAlbums(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -14,17 +14,17 @@
 public interface ArtistContributionRepository extends JpaRepository<ArtistContribution, ArtistContributionId> {
 
-    @Query("SELECT NEW com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDto( ac.musicalEntity.id," +
-            "ac.musicalEntity.title," +
-            "ac.musicalEntity.genre," +
-            "ac.role, " +
-            "CASE WHEN s.id IS NOT NULL THEN 'SONG' " +
-            "WHEN a.id IS NOT NULL THEN 'ALBUM' " +
-            "ELSE 'Unknown' END," +
-            "(CASE WHEN l.id IS NOT NULL THEN true ELSE false END)) " +
-            "FROM ArtistContribution ac " +
-            "LEFT JOIN Song s  ON s.musicalEntities.id=ac.musicalEntity.id " +
-            "LEFT JOIN Album a ON a.musicalEntities.id=ac.musicalEntity.id " +
-            "LEFT JOIN Like l ON l.musicalEntity.id=ac.musicalEntity.id AND l.listener.id=:currentUserId " +
-            "WHERE ac.artist.id=:artistId")
+    @Query("""
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDto(
+            ac.musicalEntity.id, ac.musicalEntity.title, ac.musicalEntity.genre, ac.role,
+            (CASE WHEN s.id IS NOT NULL THEN 'SONG'
+                  WHEN a.id IS NOT NULL THEN 'ALBUM'
+                  ELSE 'Unknown' END),
+            (CASE WHEN l.id IS NOT NULL THEN true ELSE false END))
+        FROM ArtistContribution ac
+        LEFT JOIN Song s  ON s.musicalEntities.id=ac.musicalEntity.id
+        LEFT JOIN Album a ON a.musicalEntities.id=ac.musicalEntity.id
+        LEFT JOIN Like l ON l.musicalEntity.id=ac.musicalEntity.id AND l.listener.id=:currentUserId
+        WHERE ac.artist.id=:artistId
+        """)
     List<ArtistContributionDto>findContributionsByArtistId(@Param("currentUserId")Long currentUserId,@Param("artistId")Long artistId);
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -13,14 +13,18 @@
 public interface ArtistRepository extends JpaRepository<Artist, Long> {
 
-    @Query("SELECT DISTINCT a FROM Artist a "+
-        "JOIN FETCH a.nonAdminUser nu "+
-        "JOIN FETCH nu.user "+
-        "WHERE a.id=:artistId")
+    @Query("""
+        SELECT DISTINCT a FROM Artist a
+        JOIN FETCH a.nonAdminUser nu
+        JOIN FETCH nu.user
+        WHERE a.id=:artistId
+        """)
     Optional<Artist>findByIdWithUser(@Param("artistId")Long artistId);
 
-    @Query("SELECT a FROM Artist a " +
-            "JOIN FETCH a.nonAdminUser nau " +
-            "JOIN FETCH nau.user u " +
-            "WHERE u.username = :username")
+    @Query("""
+            SELECT a FROM Artist a
+            JOIN FETCH a.nonAdminUser nau
+            JOIN FETCH nau.user u
+            WHERE u.username = :username
+            """)
     Optional<Artist> findByUsername(@Param("username") String username);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/FollowRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/FollowRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/FollowRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -20,7 +20,9 @@
     long countByFollowerId(Long userId);
 
-    @Query("SELECT CASE WHEN COUNT (f)>0 THEN  true ELSE false END " +
-            "FROM Follow f "+
-            "WHERE f.followee.id=:selectedUserId AND f.follower.id=:currentUserId")
+    @Query("""
+        SELECT CASE WHEN COUNT (f)>0 THEN  true ELSE false END
+        FROM Follow f
+        WHERE f.followee.id=:selectedUserId AND f.follower.id=:currentUserId
+        """)
     boolean isFollowing(@Param("currentUserId") Long currentUSerId,@Param("selectedUserId")Long selectedUserId);
 
@@ -28,14 +30,18 @@
     List<Follow>getFollowsByFollower_Id(Long id);
 
-    @Query("SELECT f FROM Follow f " +
-            "JOIN FETCH f.follower nu " +
-            "JOIN FETCH nu.user " +
-            "WHERE f.followee.id = :id")
+    @Query("""
+        SELECT f FROM Follow f
+        JOIN FETCH f.follower nu
+        JOIN FETCH nu.user
+        WHERE f.followee.id = :id
+        """)
     List<Follow> findFollowersWithProfile(@Param("id") Long id);
 
-    @Query("SELECT f FROM Follow f " +
-            "JOIN FETCH f.followee nu " +
-            "JOIN FETCH nu.user " +
-            "WHERE f.follower.id = :id")
+    @Query("""
+        SELECT f FROM Follow f
+        JOIN FETCH f.followee nu
+        JOIN FETCH nu.user
+        WHERE f.follower.id = :id
+        """)
     List<Follow> findFollowingWithProfile(@Param("id") Long id);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -1,5 +1,4 @@
 package com.ukim.finki.develop.finkwave.repository;
 
-import com.ukim.finki.develop.finkwave.model.MusicalEntity;
 import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -15,32 +14,33 @@
 @Repository
 public interface LikeRepository extends JpaRepository<Like, LikeId> {
-    @Query("SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(" +
-            "me.id, " +
-            "me.title, " +
-            "me.genre, " +
-            "CASE WHEN s.id IS NOT NULL THEN 'SONG' " +
-            "     WHEN a.id IS NOT NULL THEN 'ALBUM' " +
-            "     ELSE 'UNKNOWN' END, " +
-            "u.fullName, " +
-            "(CASE WHEN currentUserLike.id IS NOT NULL THEN true ELSE false END)" +
-            ") " +
-            "FROM Like l " +
-            "JOIN l.musicalEntity me " +
-            "JOIN me.releasedBy nu " +
-            "JOIN nu.nonAdminUser.user u " +
-            "LEFT JOIN Song s ON s.musicalEntities.id = me.id " +
-            "LEFT JOIN Album a ON a.musicalEntities.id = me.id " +
-            "LEFT JOIN Like currentUserLike ON currentUserLike.musicalEntity.id = me.id " +
-            "AND currentUserLike.listener.id = :currentUserId " +
-            "WHERE l.listener.id = :listenerId")
+    @Query("""
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+            me.id,
+            me.title,
+            me.genre,
+            (CASE WHEN s.id IS NOT NULL THEN 'SONG'
+                 WHEN a.id IS NOT NULL THEN 'ALBUM'
+                 ELSE 'UNKNOWN' END),
+            u.fullName,
+            (CASE WHEN currentUserLike.id IS NOT NULL THEN true ELSE false END))
+        FROM Like l
+        JOIN l.musicalEntity me
+        JOIN me.releasedBy nu
+        JOIN nu.nonAdminUser.user u
+        LEFT JOIN Song s ON s.musicalEntities.id = me.id
+        LEFT JOIN Album a ON a.musicalEntities.id = me.id
+        LEFT JOIN Like currentUserLike ON currentUserLike.musicalEntity.id = me.id
+        AND currentUserLike.listener.id = :currentUserId
+        WHERE l.listener.id = :listenerId
+        """)
     List<MusicalEntityDto> findLikedEntitiesWithTypeByListenerId(@Param("currentUserId")Long currentUserId,@Param("listenerId") Long listenerId);
 
 
-    @Query("SELECT CASE WHEN COUNT (l)>0 THEN true ELSE false END " +
-            "FROM MusicalEntity  me " +
-            "JOIN Like  l on l.musicalEntity.id=me.id " +
-            "WHERE l.listener.id=:userId"
-
-    )
+    @Query("""
+        SELECT CASE WHEN COUNT (l)>0 THEN true ELSE false END
+        FROM MusicalEntity me
+        JOIN Like  l on l.musicalEntity.id=me.id
+        WHERE l.listener.id=:userId
+        """)
     boolean isLikedByUser(@Param("userId") Long userId);
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -12,15 +12,18 @@
 @Repository
 public interface ListenerRepository extends JpaRepository<Listener, Long> {
-    @Query("SELECT DISTINCT l FROM Listener l " +
-           "JOIN FETCH l.nonAdminUser nu " +
-           "JOIN FETCH nu.user " +
-           "WHERE l.id = :listenerId")
+    @Query("""
+        SELECT DISTINCT l FROM Listener l
+       JOIN FETCH l.nonAdminUser nu
+       JOIN FETCH nu.user
+       WHERE l.id = :listenerId
+       """)
     Optional<Listener> findByIdWithUser(@Param("listenerId") Long listenerId);
 
-    @Query("SELECT l FROM Listener l " +
-            "JOIN FETCH l.nonAdminUser nu " +
-            "JOIN FETCH nu.user u " +
-            "WHERE u.username=:username")
-
+    @Query("""
+        SELECT l FROM Listener l
+        JOIN FETCH l.nonAdminUser nu
+        JOIN FETCH nu.user u
+        WHERE u.username=:username
+        """)
     Optional<Listener>findByUsername(@Param("username")String username);
 }
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/NonAdminUserRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/NonAdminUserRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/NonAdminUserRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -14,15 +14,21 @@
 public interface NonAdminUserRepository extends JpaRepository<NonAdminUser, Long> {
 
-    @Query("SELECT n FROM NonAdminUser n JOIN FETCH n.user")
+    @Query("""
+        SELECT n FROM NonAdminUser n JOIN FETCH n.user
+    """)
     List<NonAdminUser> findAllWithUser();
 
-    @Query("SELECT u FROM NonAdminUser u " +
-            "WHERE u.user.fullName ILIKE CONCAT('%', :name, '%' ) "+
-            "OR  u.user.username ILIKE CONCAT('%', :name, '%' ) ")
+    @Query("""
+        SELECT u FROM NonAdminUser u
+        WHERE u.user.fullName ILIKE '%' || :name || '%'
+        OR  u.user.username ILIKE '%' || :name || '%'
+    """)
     List<NonAdminUser> searchByName(String name);
 
-    @Query("SELECT nau FROM NonAdminUser nau " +
-            "JOIN FETCH nau.user u " +
-            "WHERE u.username = :username")
+    @Query("""
+        SELECT nau FROM NonAdminUser nau
+        JOIN FETCH nau.user u
+        WHERE u.username = :username
+        """)
     Optional<NonAdminUser> findByUsername(@Param("username") String username);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -14,9 +14,11 @@
 
 
-    @Query("SELECT DISTINCT p FROM Playlist p " +
-            "JOIN FETCH p.createdBy l " +
-            "JOIN FETCH l.nonAdminUser nu " +
-            "JOIN FETCH nu.user u " +
-            "WHERE l.id = :creatorId")
+    @Query("""
+        SELECT DISTINCT p FROM Playlist p
+        JOIN FETCH p.createdBy l
+        JOIN FETCH l.nonAdminUser nu
+        JOIN FETCH nu.user u
+        WHERE l.id = :creatorId
+        """)
     List<Playlist> findByCreatorId(@Param("creatorId") Long creatorId);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SavedPlaylistRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SavedPlaylistRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SavedPlaylistRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -17,10 +17,12 @@
     List<SavedPlaylist>findAllByListener_Id(Long currentUserId);
 
-    @Query("SELECT p FROM SavedPlaylist sp " +
-            "JOIN sp.playlist p " +
-            "JOIN FETCH p.createdBy l " +
-            "JOIN FETCH l.nonAdminUser nau " +
-            "JOIN FETCH nau.user u " +
-            "WHERE sp.id.listenerId = :listenerId")
+    @Query("""
+        SELECT p FROM SavedPlaylist sp
+        JOIN sp.playlist p
+        JOIN FETCH p.createdBy l
+        JOIN FETCH l.nonAdminUser nau
+        JOIN FETCH nau.user u
+        WHERE sp.id.listenerId = :listenerId
+        """)
     List<Playlist> findSavedPlaylistsMetadata(@Param("listenerId") Long listenerId);
 }
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 cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -16,48 +16,46 @@
 
     @Query("""
-            SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
-                s.id, me.title, me.genre, 'SONG', u.fullName, me.cover,
-                (CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END)
-            )
-            FROM Song s
-            JOIN s.musicalEntities me
-            JOIN me.releasedBy a
-            JOIN a.nonAdminUser nau
-            JOIN nau.user u
-            LEFT JOIN Like l ON l.musicalEntity.id = s.id AND l.listener.id = :currentUserId
-            WHERE s.album.id = :albumId
-            """
-    )
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+            s.id, me.title, me.genre, 'SONG', u.fullName, me.cover,
+            (CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END)
+        )
+        FROM Song s
+        JOIN s.musicalEntities me
+        JOIN me.releasedBy a
+        JOIN a.nonAdminUser nau
+        JOIN nau.user u
+        LEFT JOIN Like l ON l.musicalEntity.id = s.id AND l.listener.id = :currentUserId
+        WHERE s.album.id = :albumId
+    """)
     List<MusicalEntityDto>findSongsByAlbum(@Param("albumId") Long albumId, @Param("currentUserId")Long currentUserId);
 
 
     @Query("""
-            SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
             s.id, me.title, me.genre, 'SONG', u.fullName, me.cover,
             (CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END))
-            FROM Song s
-            JOIN s.musicalEntities me
-            JOIN me.releasedBy a
-            JOIN a.nonAdminUser nau
-            JOIN nau.user u
-            JOIN PlaylistSong ps ON ps.song.id=s.id
-            LEFT JOIN Like l ON l.musicalEntity.id=s.id AND l.listener.id=:currentUserId
-            WHERE ps.playlist.id=:playlistId
+        FROM Song s
+        JOIN s.musicalEntities me
+        JOIN me.releasedBy a
+        JOIN a.nonAdminUser nau
+        JOIN nau.user u
+        JOIN PlaylistSong ps ON ps.song.id=s.id
+        LEFT JOIN Like l ON l.musicalEntity.id=s.id AND l.listener.id=:currentUserId
+        WHERE ps.playlist.id=:playlistId
     """)
     List<MusicalEntityDto>findSongsByPlaylistId(@Param("playlistId")Long playlistId, @Param("currentUserId")Long currentUserId);
 
     @Query("""
-            SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
-            s.id, me.title, me.genre, 'SONG', u.fullName, me.cover, FALSE)
-            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
-            ORDER BY count(*) desc
-    """
-    )
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+        s.id, me.title, me.genre, 'SONG', u.fullName, me.cover, FALSE)
+        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
+        ORDER BY count(*) desc
+    """)
     // todo: handle likes, momentalno site se false za da raboti joinot
     // todo: add paging
@@ -67,14 +65,13 @@
     // todo: fix is liked by user, currently returns hard coded false
     @Query("""
-            SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
             s.id, me.title, me.genre, 'SONG', u.fullName, me.cover, FALSE )
-            FROM Song s
-            JOIN s.musicalEntities me
-            JOIN me.releasedBy a
-            JOIN a.nonAdminUser nau
-            JOIN nau.user u
-            WHERE me.title ILIKE %:searchTerm%
-            """
-    )
+        FROM Song s
+        JOIN s.musicalEntities me
+        JOIN me.releasedBy a
+        JOIN a.nonAdminUser nau
+        JOIN nau.user u
+        WHERE me.title ILIKE %:searchTerm%
+    """)
     List<MusicalEntityDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);
 
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java	(revision cb4a1da079608fdb022036c90eb6e41f26046827)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java	(revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891)
@@ -16,6 +16,6 @@
     @Query("""
         SELECT u from User u
-        WHERE (u.fullName ilike %:searchTerm% or u.username ilike %:searchTerm%)
-            and u.listener = true and u.artist = false 
+        WHERE (u.fullName ILIKE '%' || :searchTerm || '%' or u.username ILIKE '%' || :searchTerm || '%')
+            and u.listener = true and u.artist = false
         """)
     List<User> searchListeners(String searchTerm);
@@ -23,5 +23,5 @@
     @Query("""
         SELECT u from User u
-        WHERE (u.fullName ilike %:searchTerm% or u.username ilike %:searchTerm%)
+        WHERE (u.fullName ILIKE '%' || :searchTerm || '%' or u.username ILIKE '%' || :searchTerm || '%')
             and u.artist = true
         """)