diff --git a/internal/api/admin_invites.go b/internal/api/admin_invites.go
index c9fd3fd4..63da745c 100644
--- a/internal/api/admin_invites.go
+++ b/internal/api/admin_invites.go
@@ -14,7 +14,6 @@ import (
 
 	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/audit"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
 )
 
diff --git a/internal/api/admin_tracks.go b/internal/api/admin_tracks.go
index 9ab09239..251d287b 100644
--- a/internal/api/admin_tracks.go
+++ b/internal/api/admin_tracks.go
@@ -8,7 +8,6 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/tracks"
 )
 
diff --git a/internal/api/likes.go b/internal/api/likes.go
index b94d2ae4..dcf5ac87 100644
--- a/internal/api/likes.go
+++ b/internal/api/likes.go
@@ -303,6 +303,3 @@ func uuidsToStrings(ids []pgtype.UUID) []string {
 	return out
 }
 
-// Compile-time references so the json import is always live even when
-// no handler in this file decodes a body.
-var _ = json.Marshal
diff --git a/internal/api/playlists.go b/internal/api/playlists.go
index 03536cda..4c8079bb 100644
--- a/internal/api/playlists.go
+++ b/internal/api/playlists.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-chi/chi/v5"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 
diff --git a/internal/api/search.go b/internal/api/search.go
index c2c5f73e..d0ba6575 100644
--- a/internal/api/search.go
+++ b/internal/api/search.go
@@ -83,7 +83,7 @@ func (h *handlers) handleSearch(w http.ResponseWriter, r *http.Request) {
 		userID = user.ID
 	}
 	tracks, err := dbQ.SearchTracks(r.Context(), dbq.SearchTracksParams{
-		Column1: needle, UserID: userID, Limit: int32(limit), Offset: int32(offset),
+		Column1: q, UserID: userID, Limit: int32(limit), Offset: int32(offset),
 	})
 	if err != nil {
 		h.logger.Error("api: search tracks failed", "err", err)
diff --git a/internal/subsonic/browse.go b/internal/subsonic/browse.go
index 44cec8bb..9bdc9d6f 100644
--- a/internal/subsonic/browse.go
+++ b/internal/subsonic/browse.go
@@ -376,7 +376,7 @@ func (b *browseHandlers) search3(w http.ResponseWriter, r *http.Request) {
 
 	if songCount > 0 {
 		tracks, err := q.SearchTracks(r.Context(), dbq.SearchTracksParams{
-			Column1: needle, Limit: int32(songCount), Offset: int32(songOffset),
+			Column1: query, Limit: int32(songCount), Offset: int32(songOffset),
 		}) // UserID left zero (NULL) — Subsonic has no per-user quarantine context
 		if err != nil {
 			WriteFail(w, r, ErrGeneric, "Song search failed")