diff --git a/advanced_filters/static/advanced-filters/advanced-filters.js b/advanced_filters/static/advanced-filters/advanced-filters.js
index 4dda293..efbb020 100644
--- a/advanced_filters/static/advanced-filters/advanced-filters.js
+++ b/advanced_filters/static/advanced-filters/advanced-filters.js
@@ -70,7 +70,11 @@ var OperatorHandlers = function($) {
 						  MODEL_LABEL) + '/' + field;
 		var input = $(elm).parents('tr').find('input.query-value');
 		input.select2("destroy");
+		var value = input.val();
 		$.get(choices_url, function(data) {
+			if (value) {
+				data.results.push({'id': value, 'text': value})
+			}
 			input.select2({'data': data, 'createSearchChoice': function(term) {
                 return { 'id': term, 'text': term };
             }});
@@ -126,6 +130,7 @@ var OperatorHandlers = function($) {
 				if ($(this).val() != before_change) self.field_selected(this);
 				$(this).data('pre_change', $(this).val());
 			}).change();
+			self.initialize_select2(this)
 		});
 	};
 
diff --git a/advanced_filters/urls.py b/advanced_filters/urls.py
index fbd196a..a8fd76e 100644
--- a/advanced_filters/urls.py
+++ b/advanced_filters/urls.py
@@ -1,10 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from advanced_filters.views import GetFieldChoices
 
-urlpatterns = patterns(
-    # API
-    '',
+urlpatterns = [
     url(r'^field_choices/(?P<model>.+)/(?P<field_name>.+)/?',
         GetFieldChoices.as_view(),
         name='afilters_get_field_choices'),
@@ -13,4 +11,4 @@
     url(r'^field_choices/$',
         GetFieldChoices.as_view(),
         name='afilters_get_field_choices'),
-)
+]