diff --git a/grpc-backend/database.go b/grpc-backend/database.go
index 49a075a..48d0cd7 100644
--- a/grpc-backend/database.go
+++ b/grpc-backend/database.go
@@ -330,7 +330,7 @@ func getBeatmapCount(db *sql.DB) int {
 }
 
 func getRecent(db *sql.DB, limit, offset int) ([]Song, error) {
-	rows, err := db.Query("SELECT BeatmapId, MD5Hash, Title, Artist, Creator, Folder, File, Audio, TotalTime FROM Beatmap ORDER BY LastModifiedTime DESC LIMIT ? OFFSET ?", limit, offset)
+	rows, err := db.Query("SELECT BeatmapId, MD5Hash, Title, Artist, Creator, Folder, File, Audio, TotalTime FROM Beatmap GROUP BY Folder ORDER BY LastModifiedTime DESC LIMIT ? OFFSET ?", limit, offset)
 	if err != nil {
 		return []Song{}, err
 	}
diff --git a/grpc-backend/main.go b/grpc-backend/main.go
index 47f7e2b..ee83c16 100644
--- a/grpc-backend/main.go
+++ b/grpc-backend/main.go
@@ -193,8 +193,8 @@ func runGrpcAndGateway(s *Server, port string) error {
 	mux := &http.ServeMux{}
 
 	mux.HandleFunc("/callback/", s.callback)
-	mux.HandleFunc("api/v1/audio/{filepath}", s.songFile)
-	mux.HandleFunc("api/v1/image/{filepath}", s.imageFile)
+	mux.HandleFunc("/api/v1/audio/{filepath}", s.songFile)
+	mux.HandleFunc("/api/v1/image/{filepath}", s.imageFile)
 
 	fileServer := http.FileServer(http.Dir("gen/swagger"))
 	mux.Handle("/swagger/", http.StripPrefix("/swagger/", fileServer))