diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php
index 0bd18981b..bc3717a46 100644
--- a/application/controllers/Gridmap.php
+++ b/application/controllers/Gridmap.php
@@ -39,7 +39,7 @@ class Gridmap extends CI_Controller {
 			'assets/js/leaflet/L.MaidenheadColouredGridMap.js',
 			'assets/js/sections/gridmap.js?'
 		];
-		
+
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('gridmap/index');
 		$this->load->view('interface_assets/footer', $footerData);
@@ -85,16 +85,16 @@ class Gridmap extends CI_Controller {
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
-					array_push($array_grid_2char_confirmed, $grid_2char_confirmed);	
+					array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
 				}
 
 				if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
-					array_push($array_grid_4char_confirmed, $grid_4char_confirmed);	
+					array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
 				}
 
 				if ($this->config->item('map_6digit_grids')) {
 					if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
-						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);	
+						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
 					}
 				}
 			}
@@ -113,16 +113,16 @@ class Gridmap extends CI_Controller {
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_two, $array_grid_2char)){
-					array_push($array_grid_2char, $grid_two);	
+					array_push($array_grid_2char, $grid_two);
 				}
 
 				if(!in_array($grid_four, $array_grid_4char)){
-					array_push($array_grid_4char, $grid_four);	
+					array_push($array_grid_4char, $grid_four);
 				}
 
 				if ($this->config->item('map_6digit_grids')) {
 					if(!in_array($grid_six, $array_grid_6char)){
-						array_push($array_grid_6char, $grid_six);	
+						array_push($array_grid_6char, $grid_six);
 					}
 				}
 			}
@@ -134,18 +134,18 @@ class Gridmap extends CI_Controller {
 
 				$grids = explode(",", $row->COL_VUCC_GRIDS);
 
-				foreach($grids as $key) {    
-					$grid_two = strtoupper(substr($key,0,2));
-					$grid_four = strtoupper(substr($key,0,4));
+				foreach($grids as $key) {
+					$grid_two = strtoupper(substr(trim($key),0,2));
+					$grid_four = strtoupper(substr(trim($key),0,4));
 
 					// Check if 2 Char is in array
 					if(!in_array($grid_two, $array_grid_2char)){
-						array_push($array_grid_2char, $grid_two);	
+						array_push($array_grid_2char, $grid_two);
 					}
 
 
 					if(!in_array($grid_four, $array_grid_4char)){
-						array_push($array_grid_4char, $grid_four);	
+						array_push($array_grid_4char, $grid_four);
 					}
 				}
 			}
@@ -159,18 +159,18 @@ class Gridmap extends CI_Controller {
 
 				$grids = explode(",", $row->COL_VUCC_GRIDS);
 
-				foreach($grids as $key) {    
-					$grid_2char_confirmed = strtoupper(substr($key,0,2));
-					$grid_4char_confirmed = strtoupper(substr($key,0,4));
+				foreach($grids as $key) {
+					$grid_2char_confirmed = strtoupper(substr(trim($key),0,2));
+					$grid_4char_confirmed = strtoupper(substr(trim($key),0,4));
 
 					// Check if 2 Char is in array
 					if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
-						array_push($array_grid_2char_confirmed, $grid_2char_confirmed);	
+						array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
 					}
 
 
 					if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
-						array_push($array_grid_4char_confirmed, $grid_4char_confirmed);	
+						array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
 					}
 				}
 			}