diff --git a/combo_plugin_gnm/templatetags/gnm.py b/combo_plugin_gnm/templatetags/gnm.py
index 6df2ab5..0184207 100644
--- a/combo_plugin_gnm/templatetags/gnm.py
+++ b/combo_plugin_gnm/templatetags/gnm.py
@@ -21,7 +21,6 @@ import math
 import operator
 import random
 import re
-import urllib2
 
 from dateutil.parser import parse as dateutil_parse
 from requests import RequestException
@@ -29,6 +28,7 @@ from requests import RequestException
 from django import template
 from django.conf import settings
 from django.utils.dateparse import parse_datetime
+from django.utils.http import quote
 from django.utils.text import slugify
 from django.utils.timezone import is_naive, make_aware
 from django.utils.safestring import mark_safe
@@ -438,7 +438,7 @@ def get_suggestions(request, cell, user_data, places_data):
     nominatim_url = 'https://nominatim.entrouvert.org'
     for address in addresses:
         url = '%s/search?q=%s&accept-language=fr&format=json' % (
-                nominatim_url, urllib2.quote(address.encode('utf-8')))
+                nominatim_url, quote(address.encode('utf-8')))
         try:
             search_result = requests.get(url, timeout=2, without_user=True,
                     cache_duration=300).json()