diff --git a/explorer/models.py b/explorer/models.py
index d2b8b962..34a2d6d8 100644
--- a/explorer/models.py
+++ b/explorer/models.py
@@ -1,4 +1,5 @@
 from explorer.utils import passes_blacklist, swap_params, extract_params, shared_dict_update, get_connection, get_s3_connection
+from future.utils import python_2_unicode_compatible
 from django.db import models, DatabaseError
 from time import time
 from django.core.urlresolvers import reverse
@@ -12,7 +13,7 @@
 
 logger = logging.getLogger(__name__)
 
-
+@python_2_unicode_compatible
 class Query(models.Model):
     title = models.CharField(max_length=255)
     sql = models.TextField()
@@ -31,8 +32,8 @@ class Meta:
         ordering = ['title']
         verbose_name_plural = 'Queries'
 
-    def __unicode__(self):
-        return six.text_type(self.title)
+    def __str__(self):
+        return self.title
 
     def get_run_count(self):
         return self.querylog_set.count()
diff --git a/requirements.txt b/requirements.txt
index d952625d..e072b079 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,5 @@ six==1.10.0
 sqlparse==0.1.18
 unicodecsv==0.14.1
 ago==0.0.93
+# py2/3 compatible libraries
+future==0.18.2