diff --git a/src/komap.py b/src/komap.py
index 81834e7..7563b26 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -844,8 +844,9 @@ if options.renderer == "mapnik":
 
                 ttext = " OR ".join(['"'+i+ "\" is not NULL " for i in texttags])
                 itags = [columnmap.get(i, (i,))[0] for i in itags]
-                itags = add_numerics_to_itags(itags, escape = False)
+                itags = add_numerics_to_itags(itags) 
                 if placement == "center" and layer_type == "polygon" and snap_to_street == 'false':
+                  
                   sqlz = " OR ".join(sql)
                   itags = ", ".join(itags)
                   if not order:
@@ -858,6 +859,7 @@ if options.renderer == "mapnik":
                           where (%s) and (%s) and (way_area > %s) and way && ST_Expand(!bbox!,3000) %s way_area desc
                   """%(itags,layer_type,ttext,sqlz,pixel_size_at_zoom(zoom,3)**2, order)
                   else:
+                    itags = add_numerics_to_itags(itags, escape = False) # for complex polygons, no escapng needed
                     sqlz = """select %s, way
                   from (
                     select (ST_Dump(ST_Multi(ST_Buffer(ST_Collect(p.way),%s)))).geom as way, %s