diff --git a/server/djrandom/model/mp3.py b/server/djrandom/model/mp3.py
index 2afae7a4884928c965cb00e63dcc0b737c2855e7..fd3546f7a2297f362aaf728fe86b6f445c5b0d89 100644
--- a/server/djrandom/model/mp3.py
+++ b/server/djrandom/model/mp3.py
@@ -33,6 +33,7 @@ class MP3(Base):
     """
 
     __tablename__ = 'mp3'
+    __table_args__ = {'mysql_charset': 'utf8'}
 
     INCOMING = 'I'
     READY = 'R'
@@ -44,9 +45,9 @@ class MP3(Base):
     state = Column(String(1), default=INCOMING, index=True)
     path = Column(String(1024))
     size = Column(Integer())
-    artist = Column(Unicode(256))
-    title = Column(Unicode(256))
-    album = Column(Unicode(256))
+    artist = Column(Unicode(256), index=True)
+    title = Column(Unicode(256), index=True)
+    album = Column(Unicode(256), index=True)
     track_num = Column(Integer())
     genre = Column(Unicode(64))
     uploaded_at = Column(DateTime())