diff --git a/application/models/Map_model.php b/application/models/Map_model.php
index 48f576df8..410ac75ad 100644
--- a/application/models/Map_model.php
+++ b/application/models/Map_model.php
@@ -9,10 +9,8 @@ class Map_model extends CI_Model {
         $this->db->select('DISTINCT dxcc_entities.name AS COL_COUNTRY, COL_DXCC, COUNT(*) as qso_count', FALSE);
         $this->db->from($this->config->item('table_name'));
         $this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id');
-        $this->db->join('dxcc_entities', 'dxcc_entities.adif = ' . $this->config->item('table_name') . '.COL_DXCC', 'left');
+        $this->db->join('dxcc_entities', 'dxcc_entities.adif = ' . $this->config->item('table_name') . '.COL_DXCC');
         $this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
-        $this->db->where('COL_COUNTRY IS NOT NULL');
-        $this->db->where('COL_COUNTRY !=', '');
         $this->db->where("LENGTH(COL_GRIDSQUARE) >=", 6); // At least 6 chars
         $this->db->group_by('COL_COUNTRY, COL_DXCC');
         $this->db->order_by('COL_COUNTRY');
diff --git a/application/views/map/qso_map.php b/application/views/map/qso_map.php
index ac9a93650..658109ce5 100644
--- a/application/views/map/qso_map.php
+++ b/application/views/map/qso_map.php
@@ -284,7 +284,7 @@ function initMap() {
         if (dxcc && supportedDxccs.includes(parseInt(dxcc))) {
             // Single country GeoJSON
             $.ajax({
-                url: site_url + "/map/get_country_geojson/",
+                url: base_url + "index.php/map/get_country_geojson/",
                 type: 'post',
                 data: { dxcc: dxcc },
                 success: function(geojson) {