diff --git a/lib/mpd_client/server.rb b/lib/mpd_client/server.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/mpd_client/song.rb b/lib/mpd_client/song.rb
index d50c8df..ee3304e 100644
--- a/lib/mpd_client/song.rb
+++ b/lib/mpd_client/song.rb
@@ -2,7 +2,6 @@ module MPDClient
   class Song
 
     include ClassToProc
-    include Comparable
     include Jsonable
 
     extend Forwardable
diff --git a/lib/mpd_client/webserver.rb b/lib/mpd_client/webserver.rb
index db6cc7b..10a0a19 100755
--- a/lib/mpd_client/webserver.rb
+++ b/lib/mpd_client/webserver.rb
@@ -3,6 +3,7 @@ require 'sinatra/asset_pipeline'
 require 'sass'
 require 'cgi'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/hash/keys'
 
 module MPDClient
   class Webserver < Sinatra::Base
@@ -82,7 +83,7 @@ module MPDClient
 
       get '/songs' do
         content_type 'application/json'
-        if query = params.slice(:artist, :album) and !query.empty?
+        if query = params.symbolize_keys.slice(:artist, :album) and !query.empty?
           Song.by(**query).to_json
         else
           Song.all.sort.to_json