diff --git a/aldryn_locations/forms.py b/aldryn_locations/forms.py
index 7c7d44f..5958f1b 100644
--- a/aldryn_locations/forms.py
+++ b/aldryn_locations/forms.py
@@ -66,7 +66,6 @@ class EmbedViewPluginForm(ModelForm):
     class Meta:
         model = EmbedViewPlugin
         fields = [
-            'query',
             'map_type',
             'center',
             'zoom',
diff --git a/aldryn_locations/migrations/0005_auto_20180507_1427.py b/aldryn_locations/migrations/0005_auto_20180507_1427.py
new file mode 100644
index 0000000..a00a15c
--- /dev/null
+++ b/aldryn_locations/migrations/0005_auto_20180507_1427.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-07 04:27
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aldryn_locations', '0004_auto_20160914_1511'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='embeddirectionsplugin',
+            name='query',
+        ),
+        migrations.RemoveField(
+            model_name='embedviewplugin',
+            name='query',
+        ),
+    ]
diff --git a/aldryn_locations/models.py b/aldryn_locations/models.py
index 1ec7ac9..d19e2fd 100644
--- a/aldryn_locations/models.py
+++ b/aldryn_locations/models.py
@@ -18,7 +18,7 @@
     'ALDRYN_LOCATIONS_GOOGLEMAPS_STATICMAPS_URL',
     'https://maps.googleapis.com/maps/api/staticmap',
 )
-MARKER_CONTENT_FORMAT = unicode(settings.ALDRYN_LOCATIONS_MARKER_CONTENT_FORMAT)
+MARKER_CONTENT_FORMAT = str(settings.ALDRYN_LOCATIONS_MARKER_CONTENT_FORMAT)
 ZOOM_LEVELS = [(str(level), str(level)) for level in range(22)]
 
 ROADMAP = 'roadmap'