diff --git a/umap/models.py b/umap/models.py
index 0729f849..182684c0 100644
--- a/umap/models.py
+++ b/umap/models.py
@@ -298,7 +298,7 @@ class Map(NamedModel):
     def generate_umapjson(self, request, include_data=True):
         umapjson = self.settings
         umapjson["type"] = "umap"
-        umapjson["properties"]["is_template"] = False
+        umapjson["properties"].pop("is_template", None)
         umapjson["uri"] = request.build_absolute_uri(self.get_absolute_url())
         datalayers = []
         for datalayer in self.datalayers:
diff --git a/umap/views.py b/umap/views.py
index 3933511e..19879924 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -402,9 +402,9 @@ class UserDownload(DetailView, SearchMixin):
         return self.get_queryset().get(pk=self.request.user.pk)
 
     def get_maps(self):
-        qs = Map.private.for_user(self.object)
-        qs = qs.filter(id__in=self.request.GET.getlist("map_id"))
-        return qs.order_by("-modified_at")
+        qs = Map.private.filter(id__in=self.request.GET.getlist("map_id"))
+        qsu = qs.for_user(self.object)
+        return qsu.order_by("-modified_at")
 
     def render_to_response(self, context, *args, **kwargs):
         zip_buffer = io.BytesIO()