diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index c61f5eb..69863eb 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -316,6 +316,6 @@
     deployment = models.ForeignKey(Deployment,related_name='sitedeployments')
     controller = models.ForeignKey(Controller, null=True, blank=True, related_name='sitedeployments')
     availability_zone = models.CharField(max_length=200, null=True, blank=True, help_text="OpenStack availability zone")
-    tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")
+    tenant_id = models.CharField(null=True, blank=True, max_length=200, db_index=True, help_text="Keystone tenant id")
 
     def __unicode__(self):  return u'%s %s' % (self.deployment, self.site)
diff --git a/planetstack/model_policies/__init__.py b/planetstack/model_policies/__init__.py
index ac395a1..8671d6a 100644
--- a/planetstack/model_policies/__init__.py
+++ b/planetstack/model_policies/__init__.py
@@ -1,4 +1,3 @@
 from .model_policy_Slice import *
 from .model_policy_User import *
 from .model_policy_Network import *
-from .model_policy_Site import *