diff --git a/src/c3nav/mapdata/render/engines/svg.py b/src/c3nav/mapdata/render/engines/svg.py
index 5e2f720c..35b13dd3 100644
--- a/src/c3nav/mapdata/render/engines/svg.py
+++ b/src/c3nav/mapdata/render/engines/svg.py
@@ -15,6 +15,7 @@ from shapely.geometry import LineString, Polygon
 from shapely.ops import unary_union
 
 from c3nav.mapdata.render.engines.base import FillAttribs, RenderEngine, StrokeAttribs
+from c3nav.mapdata.utils.geometry import unwrap_geom
 
 if settings.SVG_RENDERER == 'rsvg':
     import pgi
@@ -23,6 +24,13 @@ if settings.SVG_RENDERER == 'rsvg':
     from pgi.repository import Rsvg
 
 
+def unwrap_hybrid_geom(geom):
+    from c3nav.mapdata.render.geometry import HybridGeometry
+    if isinstance(geom, HybridGeometry):
+        geom = geom.geom
+    return unwrap_geom(geom)
+
+
 @checks.register()
 def check_svg_renderer(app_configs, **kwargs):
     errors = []
@@ -220,7 +228,7 @@ class SVGEngine(RenderEngine):
 
     def _add_geometry(self, geometry, fill: Optional[FillAttribs], stroke: Optional[StrokeAttribs],
                       altitude=None, height=None, shape_cache_key=None, **kwargs):
-        geometry = self.buffered_bbox.intersection(geometry.geom if hasattr(geometry, 'geom') else geometry)
+        geometry = self.buffered_bbox.intersection(unwrap_hybrid_geom(geometry))
 
         if geometry.is_empty:
             return
diff --git a/src/c3nav/mapdata/views.py b/src/c3nav/mapdata/views.py
index 015ecf27..547bfdb6 100644
--- a/src/c3nav/mapdata/views.py
+++ b/src/c3nav/mapdata/views.py
@@ -12,7 +12,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.http import content_disposition_header
 from django.views.decorators.cache import cache_page
 from django.views.decorators.http import etag
-from shapely import Point, Polygon
+from shapely import Point, box
 
 from c3nav.mapdata.middleware import no_language
 from c3nav.mapdata.models import Level, MapUpdate
@@ -79,7 +79,7 @@ def preview_location(request, slug):
         level = location.level_id
     elif isinstance(location, Level):
         [minx, miny, maxx, maxy] = location.bounds
-        geometry = Polygon([(minx, miny), (minx, maxy), (maxx, maxy), (maxx, miny), (minx, miny)])
+        geometry = box(minx, miny, maxx, maxy)
         level = location.pk
         highlight = False
     else:
@@ -107,10 +107,10 @@ def preview_location(request, slug):
 
     dx = width - bounds_width
     dy = height - bounds_height
-    minx = bounds[0] - dx/2
-    maxx = bounds[2] + dx/2
-    miny = bounds[1] - dy/2
-    maxy = bounds[3] + dy/2
+    minx = int(bounds[0] - dx/2)
+    maxx = int(bounds[2] + dx/2)
+    miny = int(bounds[1] - dy/2)
+    maxy = int(bounds[3] + dy/2)
 
     img_scale = PREVIEW_IMG_HEIGHT/height
 
@@ -125,6 +125,7 @@ def preview_location(request, slug):
                            category='highlight')
     data = image.render()
     response = HttpResponse(data, 'image/png')
+    # TODO use cache key like in tile render function
     return response