diff --git a/misc/geoiplookup.py b/misc/geoiplookup.py
index bc04f4f..c488f29 100644
--- a/misc/geoiplookup.py
+++ b/misc/geoiplookup.py
@@ -24,7 +24,7 @@ import json
 
 def geoiplookup(ip):
     http = urllib3.PoolManager()
-    r = http.request('GET', f'https://api.geoiplookup.net/?query={ip}&json=true')
+    r = http.request('GET', f'http://ip-api.com/json/{ip}')
 
     if r.status != 200:
         raise Exception(r)
diff --git a/plugins/display/filter_users.py b/plugins/display/filter_users.py
index bf06b64..200f9cf 100644
--- a/plugins/display/filter_users.py
+++ b/plugins/display/filter_users.py
@@ -85,8 +85,8 @@ class IWLADisplayFilterUsers(IPlugin):
                 isp = location.get('isp', '')
                 str_location = ''
                 city = location.get('city', unknown)
-                country = location.get('countryname', unknown)
-                if location.get('city', '') or location.get('countryname'):
+                country = location.get('country', unknown)
+                if location.get('city', '') or location.get('country', ''):
                     str_location = f'{city}/{country}'
                 if isp:
                     if str_location: str_location += '<br/>'