From fb0d219c7bc624693821cee87fd489798fe86e0a Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 12 Apr 2013 22:45:24 +0200
Subject: [PATCH] harmonize formatting of frontend php

---
 lib/lib.php          |  251 +++++----
 lib/log.php          |   56 +-
 website/details.php  |   24 +-
 website/polygons.php |    4 +-
 website/reverse.php  |  117 ++---
 website/search.php   | 1172 +++++++++++++++++++++---------------------
 website/status.php   |    6 +-
 7 files changed, 830 insertions(+), 800 deletions(-)

diff --git a/lib/lib.php b/lib/lib.php
index 2deca484..62ffa293 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,6 +1,6 @@
 <?php
 
-	function failInternalError($sError, $sSQL = false, $vDumpVar = false) 
+	function failInternalError($sError, $sSQL = false, $vDumpVar = false)
 	{
 		header('HTTP/1.0 500 Internal Server Error');
 		header('Content-type: text/html; charset=utf-8');
@@ -11,10 +11,12 @@
 		if (CONST_Debug)
 		{
 			echo "<hr><h2>Debugging Information</h2><br>";
-			if ($sSQL) {
+			if ($sSQL)
+			{
 				echo "<h3>SQL query</h3><code>".$sSQL."</code>";
 			}
-			if ($vDumpVar) {
+			if ($vDumpVar)
+			{
 				echo "<h3>Result</h3> <code>";
 				var_dump($vDumpVar);
 				echo "</code>";
@@ -22,10 +24,10 @@
 		}
 		echo "\n</body></html>\n";
 		exit;
-
 	}
 
-	function userError($sError) 
+
+	function userError($sError)
 	{
 		header('HTTP/1.0 400 Bad Request');
 		header('Content-type: text/html; charset=utf-8');
@@ -35,9 +37,9 @@
 		echo '<p>If you feel this error is incorrect feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
 		echo "\n</body></html>\n";
 		exit;
-
 	}
 
+
 	function fail($sError, $sUserError = false)
 	{
 		if (!$sUserError) $sUserError = $sError;
@@ -46,23 +48,26 @@
 		exit;
 	}
 
+
 	function getBlockingProcesses()
 	{
-                $sStats = file_get_contents('/proc/stat');
-                if (preg_match('/procs_blocked ([0-9]+)/i', $sStats, $aMatches))
-                {
+		$sStats = file_get_contents('/proc/stat');
+		if (preg_match('/procs_blocked ([0-9]+)/i', $sStats, $aMatches))
+		{
 			return (int)$aMatches[1];
-                }
+		}
 		return 0;
 	}
 
+
 	function getLoadAverage()
 	{
 		$sLoadAverage = file_get_contents('/proc/loadavg');
-                $aLoadAverage = explode(' ',$sLoadAverage);
+		$aLoadAverage = explode(' ',$sLoadAverage);
 		return (float)$aLoadAverage[0];
 	}
 
+
 	function getProcessorCount()
 	{
 		$sCPU = file_get_contents('/proc/cpuinfo');
@@ -70,6 +75,7 @@
 		return sizeof($aMatches[0]);
 	}
 
+
 	function getTotalMemoryMB()
 	{
 		$sCPU = file_get_contents('/proc/meminfo');
@@ -77,6 +83,7 @@
 		return (int)($aMatches[1]/1024);
 	}
 
+
 	function getCacheMemoryMB()
 	{
 		$sCPU = file_get_contents('/proc/meminfo');
@@ -84,29 +91,32 @@
 		return (int)($aMatches[1]/1024);
 	}
 
+
 	function bySearchRank($a, $b)
 	{
 		if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
 		return ($a['iSearchRank'] < $b['iSearchRank']?-1:1);
 	}
 
+
 	function byImportance($a, $b)
 	{
 		if ($a['importance'] != $b['importance'])
 			return ($a['importance'] > $b['importance']?-1:1);
-/*
-		if ($a['aPointPolygon']['numfeatures'] != $b['aPointPolygon']['numfeatures'])
-			return ($a['aPointPolygon']['numfeatures'] > $b['aPointPolygon']['numfeatures']?-1:1);
-		if ($a['aPointPolygon']['area'] != $b['aPointPolygon']['area'])
-			return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1);
-//		if ($a['levenshtein'] != $b['levenshtein'])
-//			return ($a['levenshtein'] < $b['levenshtein']?-1:1);
+		/*
+		   if ($a['aPointPolygon']['numfeatures'] != $b['aPointPolygon']['numfeatures'])
+		   return ($a['aPointPolygon']['numfeatures'] > $b['aPointPolygon']['numfeatures']?-1:1);
+		   if ($a['aPointPolygon']['area'] != $b['aPointPolygon']['area'])
+		   return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1);
+		//		if ($a['levenshtein'] != $b['levenshtein'])
+		//			return ($a['levenshtein'] < $b['levenshtein']?-1:1);
 		if ($a['rank_search'] != $b['rank_search'])
-			return ($a['rank_search'] < $b['rank_search']?-1:1);
-*/
+		return ($a['rank_search'] < $b['rank_search']?-1:1);
+		 */
 		return ($a['foundorder'] < $b['foundorder']?-1:1);
 	}
 
+
 	function getPreferredLanguages()
 	{
 		// If we have been provided the value in $_GET it overrides browser value
@@ -116,7 +126,8 @@
 		}
 
 		$aLanguages = array();
-		if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+		if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
+		{
 			if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
 			{
 				foreach($aLanguagesParse as $iLang => $aLanguage)
@@ -126,7 +137,7 @@
 				}
 				arsort($aLanguages);
 			}
-        }
+		}
 		if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1);
 		foreach($aLanguages as $sLangauge => $fLangauagePref)
 		{
@@ -153,6 +164,7 @@
 		return $aLangPrefOrder;
 	}
 
+
 	function getWordSets($aWords)
 	{
 		$aResult = array(array(join(' ',$aWords)));
@@ -170,6 +182,7 @@
 		return $aResult;
 	}
 
+
 	function getTokensFromSets($aSets)
 	{
 		$aTokens = array();
@@ -185,37 +198,39 @@
 		return $aTokens;
 	}
 
+
 	/*
-		GB Postcode functions
-	*/
+	   GB Postcode functions
+	 */
 
 	function gbPostcodeAlphaDifference($s1, $s2)
 	{
 		$aValues = array(
-			'A'=>0,
-			'B'=>1,
-			'D'=>2,
-			'E'=>3,
-			'F'=>4,
-			'G'=>5,
-			'H'=>6,
-			'J'=>7,
-			'L'=>8,
-			'N'=>9,
-			'O'=>10,
-			'P'=>11,
-			'Q'=>12,
-			'R'=>13,
-			'S'=>14,
-			'T'=>15,
-			'U'=>16,
-			'W'=>17,
-			'X'=>18,
-			'Y'=>19,
-			'Z'=>20);
+				'A'=>0,
+				'B'=>1,
+				'D'=>2,
+				'E'=>3,
+				'F'=>4,
+				'G'=>5,
+				'H'=>6,
+				'J'=>7,
+				'L'=>8,
+				'N'=>9,
+				'O'=>10,
+				'P'=>11,
+				'Q'=>12,
+				'R'=>13,
+				'S'=>14,
+				'T'=>15,
+				'U'=>16,
+				'W'=>17,
+				'X'=>18,
+				'Y'=>19,
+				'Z'=>20);
 		return abs(($aValues[$s1[0]]*21+$aValues[$s1[1]]) - ($aValues[$s2[0]]*21+$aValues[$s2[1]]));
 	}
-	
+
+
 	function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB)
 	{
 		// Try an exact match on the gb_postcode table
@@ -226,7 +241,7 @@
 			var_dump($sSQL, $aNearPostcodes);
 			exit;
 		}
-		
+
 		if (sizeof($aNearPostcodes))
 		{
 			return array(array('lat' => $aNearPostcodes[0]['lat'], 'lon' => $aNearPostcodes[0]['lon'], 'radius' => 0.005));
@@ -235,6 +250,7 @@
 		return false;
 	}
 
+
 	function usPostcodeCalculate($sPostcode, &$oDB)
 	{
 		$iZipcode = (int)$sPostcode;
@@ -250,7 +266,7 @@
 
 		if (!sizeof($aNearPostcodes))
 		{
-   			$sSQL = 'select zipcode,ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode between '.($iZipcode-100).' and '.($iZipcode+100).' order by abs(zipcode - '.$iZipcode.') asc limit 5';
+			$sSQL = 'select zipcode,ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from us_zipcode where zipcode between '.($iZipcode-100).' and '.($iZipcode+100).' order by abs(zipcode - '.$iZipcode.') asc limit 5';
 			$aNearPostcodes = $oDB->getAll($sSQL);
 			if (PEAR::IsError($aNearPostcodes))
 			{
@@ -274,7 +290,7 @@
 				$fFac = 1;
 			else
 				$fFac = 1/($iDiff*$iDiff);
-			
+
 			$fTotalFac += $fFac;
 			$fTotalLat += $aPostcode['lat'] * $fFac;
 			$fTotalLon += $aPostcode['lon'] * $fFac;
@@ -288,12 +304,13 @@
 		return false;
 
 		/*
-			$fTotalFac is a surprisingly good indicator of accuracy
-			$iZoom = 18 + round(log($fTotalFac,32));
-			$iZoom = max(13,min(18,$iZoom));
-		*/
+		   $fTotalFac is a surprisingly good indicator of accuracy
+		   $iZoom = 18 + round(log($fTotalFac,32));
+		   $iZoom = max(13,min(18,$iZoom));
+		 */
 	}
 
+
 	function getClassTypes()
 	{
 		return array(
@@ -462,7 +479,7 @@
  'place:house_number' => array('label'=>'House Number','frequency'=>2086,'icon'=>'','defzoom'=>18,),
  'place:country_code' => array('label'=>'Country Code','frequency'=>2086,'icon'=>'','defzoom'=>18,),
 
-//
+ //
 
  'leisure:pitch' => array('label'=>'Pitch','frequency'=>762,'icon'=>'',),
  'highway:unsurfaced' => array('label'=>'Unsurfaced','frequency'=>492,'icon'=>'',),
@@ -597,9 +614,10 @@
  'railway:disused_station' => array('label'=>'Disused Station','frequency'=>114,'icon'=>'',),
  'railway:abandoned' => array('label'=>'Abandoned','frequency'=>641,'icon'=>'',),
  'railway:disused' => array('label'=>'Disused','frequency'=>72,'icon'=>'',),
-			);
+				);
 	}
 
+
 	function getClassTypesWithImportance()
 	{
 		$aOrders = getClassTypes();
@@ -611,24 +629,30 @@
 		return $aOrders;
 	}
 
-    function javascript_renderData($xVal)
-    {
-        header("Access-Control-Allow-Origin: *");
 
-        $jsonout = json_encode($xVal);
+	function javascript_renderData($xVal)
+	{
+		header("Access-Control-Allow-Origin: *");
+		$jsonout = json_encode($xVal);
 
-		if( ! isset($_GET['json_callback'])) {
+		if( ! isset($_GET['json_callback']))
+		{
 			header("Content-Type: application/json; charset=UTF-8");
 			echo $jsonout;
-		} else {
-			if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback'])) {
+		} else
+		{
+			if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback']))
+			{
 				header("Content-Type: application/javascript; charset=UTF-8");
 				echo $_GET['json_callback'].'('.$jsonout.')';
-			} else {
+			}
+			else
+			{
 				header('HTTP/1.0 400 Bad Request');
 			}
 		}
-    }
+	}
+
 
 	function _debugDumpGroupedSearches($aData, $aTokens)
 	{
@@ -651,7 +675,7 @@
 		foreach($aData as $iRank => $aRankedSet)
 		{
 			foreach($aRankedSet as $aRow)
-			{		
+			{
 				echo "<tr>";
 				echo "<td>$iRank</td>";
 
@@ -702,7 +726,7 @@
 				echo "<td>".$aRow['fLat']."</td>";
 				echo "<td>".$aRow['fLon']."</td>";
 				echo "<td>".$aRow['fRadius']."</td>";
-	
+
 				echo "</tr>";
 			}
 		}
@@ -713,18 +737,18 @@
 	function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $bRaw = false)
 	{
 		$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID)";
-		IF (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
+		if (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";
 		$sSQL .= " order by rank_address desc,isaddress desc";
 
-	        $aAddressLines = $oDB->getAll($sSQL);
-        	if (PEAR::IsError($aAddressLines))
-	        {
-        	        var_dump($aAddressLines);
-                	exit;
-	        }
+		$aAddressLines = $oDB->getAll($sSQL);
+		if (PEAR::IsError($aAddressLines))
+		{
+			var_dump($aAddressLines);
+			exit;
+		}
 		if ($bRaw) return $aAddressLines;
-//echo "<pre>";
-//var_dump($aAddressLines);
+		//echo "<pre>";
+		//var_dump($aAddressLines);
 		$aAddress = array();
 		$aFallback = array();
 		$aClassType = getClassTypes();
@@ -758,6 +782,7 @@
 		return $aAddress;
 	}
 
+
 	function getWordSuggestions(&$oDB, $sWord)
 	{
 		$sWordQuoted = getDBQuoted(trim($sWord));
@@ -771,6 +796,7 @@
 		return $aSimilar;
 	}
 
+
 	function geocodeReverse($fLat, $fLon, $iZoom=18)
 	{
 		$oDB =& getDB();
@@ -779,27 +805,27 @@
 
 		// Zoom to rank, this could probably be calculated but a lookup gives fine control
 		$aZoomRank = array(
-			0 => 2, // Continent / Sea
-			1 => 2,
-			2 => 2,
-			3 => 4, // Country
-			4 => 4,
-			5 => 8, // State
-			6 => 10, // Region
-			7 => 10, 
-			8 => 12, // County
-			9 => 12,  
-			10 => 17, // City
-			11 => 17, 
-			12 => 18, // Town / Village
-			13 => 18, 
-			14 => 22, // Suburb
-			15 => 22,
-			16 => 26, // Street, TODO: major street?
-			17 => 26, 
-			18 => 30, // or >, Building
-			19 => 30, // or >, Building
-			);
+				0 => 2, // Continent / Sea
+				1 => 2,
+				2 => 2,
+				3 => 4, // Country
+				4 => 4,
+				5 => 8, // State
+				6 => 10, // Region
+				7 => 10,
+				8 => 12, // County
+				9 => 12,
+				10 => 17, // City
+				11 => 17,
+				12 => 18, // Town / Village
+				13 => 18,
+				14 => 22, // Suburb
+				15 => 22,
+				16 => 26, // Street, TODO: major street?
+				17 => 26,
+				18 => 30, // or >, Building
+				19 => 30, // or >, Building
+				);
 		$iMaxRank = isset($aZoomRank[$iZoom])?$aZoomRank[$iZoom]:28;
 
 		// Find the nearest point
@@ -830,12 +856,12 @@
 			$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
 			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
 			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-//var_dump($sSQL);
+			//var_dump($sSQL);
 			$aPlace = $oDB->getRow($sSQL);
 			$iPlaceID = $aPlace['place_id'];
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
+				var_Dump($sSQL, $iPlaceID);
 				exit;
 			}
 		}
@@ -847,7 +873,7 @@
 			$iPlaceID = $oDB->getOne($sSQL);
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
+				var_Dump($sSQL, $iPlaceID);
 				exit;
 			}
 
@@ -857,7 +883,7 @@
 				$iPlaceID = $oDB->getOne($sSQL);
 				if (PEAR::IsError($iPlaceID))
 				{
-					var_Dump($sSQL, $iPlaceID); 
+					var_Dump($sSQL, $iPlaceID);
 					exit;
 				}
 			}
@@ -870,15 +896,16 @@
 		return $iPlaceID;
 	}
 
-        function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
-        {
-                if (!isset($_GET[$sKey])) return false;
-                $sValue = trim($_GET[$sKey]);
-                if (!$sValue) return false;
-                $aStructuredQuery[$sKey] = $sValue;
-                if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) {
-                        $iMinAddressRank = $iNewMinAddressRank;
-                        $iMaxAddressRank = $iNewMaxAddressRank;
-                }
-                return true;
-        }
+	function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
+	{
+		if (!isset($_GET[$sKey])) return false;
+		$sValue = trim($_GET[$sKey]);
+		if (!$sValue) return false;
+		$aStructuredQuery[$sKey] = $sValue;
+		if ($iMinAddressRank == 0 && $iMaxAddressRank == 30)
+		{
+			$iMinAddressRank = $iNewMinAddressRank;
+			$iMaxAddressRank = $iNewMaxAddressRank;
+		}
+		return true;
+	}
diff --git a/lib/log.php b/lib/log.php
index 5b847a41..b08f5383 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -13,7 +13,7 @@
 				$_SERVER["REMOTE_ADDR"],
 				$_SERVER['QUERY_STRING'],
 				$sQuery
-			);
+				);
 
 		if (CONST_Log_DB)
 		{
@@ -31,21 +31,21 @@
 
 		if (CONST_Log_File && CONST_Log_File_ReverseLog != '')
 		{
-                if ($sType == 'reverse')
-                {
-                        $aStartTime = explode('.',$hLog[0]);
-                        file_put_contents(CONST_Log_File_ReverseLog,
-                                $aStartTime[0].','.$aStartTime[1].','.
-                                php_uname('n').','.
-                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
-                                '"'.addslashes($hLog[1]).'",'.
-                                $_GET['lat'].','.
-                                $_GET['lon'].','.
-                                $_GET['zoom'].','.
-                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($sOutputFormat).'"'."\n",
-                        FILE_APPEND);
-                }
+			if ($sType == 'reverse')
+			{
+				$aStartTime = explode('.',$hLog[0]);
+				file_put_contents(CONST_Log_File_ReverseLog,
+								$aStartTime[0].','.$aStartTime[1].','.
+								php_uname('n').','.
+								'"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+								'"'.addslashes($hLog[1]).'",'.
+								$_GET['lat'].','.
+								$_GET['lon'].','.
+								$_GET['zoom'].','.
+								'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+								'"'.addslashes($sOutputFormat).'"'."\n",
+								FILE_APPEND);
+			}
 		}
 
 		return $hLog;
@@ -63,7 +63,7 @@
 			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
 			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
 			$sSQL .= ' and query = '.getDBQuoted($hLog[3]);
-                	$oDB->query($sSQL);
+			$oDB->query($sSQL);
 
 			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
 			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
@@ -74,17 +74,17 @@
 
 		if (CONST_Log_File && CONST_Log_File_SearchLog != '')
 		{
-                $aStartTime = explode('.',$hLog[0]);
-                file_put_contents(CONST_Log_File_SearchLog,
-                                $aStartTime[0].','.$aStartTime[1].','.
-                                php_uname('n').','.
-                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
-                                '"'.addslashes($hLog[1]).'",'.
-                                '"'.addslashes($hLog[3]).'",'.
-                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
-                                $iNumResults."\n",
-                        FILE_APPEND);
+			$aStartTime = explode('.',$hLog[0]);
+			file_put_contents(CONST_Log_File_SearchLog,
+					$aStartTime[0].','.$aStartTime[1].','.
+					php_uname('n').','.
+					'"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+					'"'.addslashes($hLog[1]).'",'.
+					'"'.addslashes($hLog[3]).'",'.
+					'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+					'"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
+					$iNumResults."\n",
+					FILE_APPEND);
 		}
 
 	}
diff --git a/website/details.php b/website/details.php
index e5a787b2..ceba8581 100755
--- a/website/details.php
+++ b/website/details.php
@@ -1,18 +1,18 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Details');
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
-        require_once(CONST_BasePath.'/lib/log.php');
+	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
-/*
-        $fLoadAvg = getLoadAverage();
-        if ($fLoadAvg > 3)
-        {
-		echo "Page temporarily blocked due to high server load\n";
-                exit;
-        }
-*/
+	/*
+	   $fLoadAvg = getLoadAverage();
+	   if ($fLoadAvg > 3)
+	   {
+	   echo "Page temporarily blocked due to high server load\n";
+	   exit;
+	   }
+	 */
 	ini_set('memory_limit', '200M');
 
 	$oDB =& getDB();
@@ -63,7 +63,7 @@
 	$sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
 	$sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
 	$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, ";
-//	$sSQL .= " ST_Area(geometry::geography) as area, ";
+	//$sSQL .= " ST_Area(geometry::geography) as area, ";
 	$sSQL .= " ST_y(centroid) as lat, ST_x(centroid) as lon,";
 	$sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
 	$sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
@@ -73,7 +73,7 @@
 	{
 		failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
 	}
-        $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
+	$aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 
 	$aClassType = getClassTypesWithImportance();
 	$aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
diff --git a/website/polygons.php b/website/polygons.php
index 3e2e878c..5a5be9f0 100755
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,6 +1,6 @@
 <?php
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
-        require_once(CONST_BasePath.'/lib/log.php');
+	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
 	ini_set('memory_limit', '200M');
diff --git a/website/reverse.php b/website/reverse.php
index 33e6cd5e..fda11582 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -4,44 +4,44 @@
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
-        if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-        {
-                $fLoadAvg = getLoadAverage();
-                if ($fLoadAvg > 2) sleep(60);
-                if ($fLoadAvg > 4) sleep(120);
-                if ($fLoadAvg > 6)
-                {
-                        echo "Bulk User: Temporary block due to high server load\n";
-                        exit;
-                }
-        }
-
-        $oDB =& getDB();
-        ini_set('memory_limit', '200M');
-
-        // Format for output
-        $sOutputFormat = 'xml';
-        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
-        {
-                $sOutputFormat = $_GET['format'];
-        }
+	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
+	{
+		$fLoadAvg = getLoadAverage();
+		if ($fLoadAvg > 2) sleep(60);
+		if ($fLoadAvg > 4) sleep(120);
+		if ($fLoadAvg > 6)
+		{
+			echo "Bulk User: Temporary block due to high server load\n";
+			exit;
+		}
+	}
+
+	$oDB =& getDB();
+	ini_set('memory_limit', '200M');
+
+	// Format for output
+	$sOutputFormat = 'xml';
+	if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
+	{
+		$sOutputFormat = $_GET['format'];
+	}
 
 	// Show address breakdown
 	$bShowAddressDetails = true;
 	if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
 
-        // Preferred language
-        $aLangPrefOrder = getPreferredLanguages();
-        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
+	// Preferred language
+	$aLangPrefOrder = getPreferredLanguages();
+	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
 	$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
-        if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
-        {
-                $iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc"));
+	if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
+	{
+		$iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc"));
 		if (CONST_Debug) var_dump($sSQL);
 		if (!$iPlaceID) $sError = 'OSM ID Not Found';
-        }
+	}
 	else
 	{
 		// Location to look up
@@ -51,27 +51,27 @@
 
 		// Zoom to rank, this could probably be calculated but a lookup gives fine control
 		$aZoomRank = array(
-			0 => 2, // Continent / Sea
-			1 => 2,
-			2 => 2,
-			3 => 4, // Country
-			4 => 4,
-			5 => 8, // State
-			6 => 10, // Region
-			7 => 10,
-			8 => 12, // County
-			9 => 12,
-			10 => 17, // City
-			11 => 17,
-			12 => 18, // Town / Village
-			13 => 18,
-			14 => 22, // Suburb
-			15 => 22,
-			16 => 26, // Street, TODO: major street?
-			17 => 26,
-			18 => 30, // or >, Building
-			19 => 30, // or >, Building
-			);
+				0 => 2, // Continent / Sea
+				1 => 2,
+				2 => 2,
+				3 => 4, // Country
+				4 => 4,
+				5 => 8, // State
+				6 => 10, // Region
+				7 => 10,
+				8 => 12, // County
+				9 => 12,
+				10 => 17, // City
+				11 => 17,
+				12 => 18, // Town / Village
+				13 => 18,
+				14 => 22, // Suburb
+				15 => 22,
+				16 => 26, // Street, TODO: major street?
+				17 => 26,
+				18 => 30, // or >, Building
+				19 => 30, // or >, Building
+				);
 		$iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
 
 		// Find the nearest point
@@ -106,7 +106,7 @@
 			$aPlace = $oDB->getRow($sSQL);
 			if (PEAR::IsError($aPlace))
 			{
-				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
+				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
 			}
 			$iPlaceID = $aPlace['place_id'];
 			$iParentPlaceID = $aPlace['parent_place_id'];
@@ -115,14 +115,15 @@
 		// The point we found might be too small - use the address to find what it is a child of
 		if ($iPlaceID && $iMaxRank < 28)
 		{
-			if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+			if ($aPlace['rank_search'] > 28 && $iParentPlaceID)
+			{
 				$iPlaceID = $iParentPlaceID;
 			}
 			$sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";
 			$iPlaceID = $oDB->getOne($sSQL);
 			if (PEAR::IsError($iPlaceID))
 			{
-				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
+				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
 			}
 			if (!$iPlaceID)
 			{
@@ -134,14 +135,14 @@
 	if ($iPlaceID)
 	{
 		$sSQL = "select placex.*,";
-        	$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-	        $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-        	$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
-        	$sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
-	        $sSQL .= " from placex where place_id = $iPlaceID ";
+		$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+		$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+		$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+		$sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
+		$sSQL .= " from placex where place_id = $iPlaceID ";
 
 		$aPlace = $oDB->getRow($sSQL);
-//var_dump($sSQL, $aPlace); exit;
+		//var_dump($sSQL, $aPlace); exit;
 
 		if ($bShowAddressDetails)
 		{
diff --git a/website/search.php b/website/search.php
index 139ed0f6..cc8fe02a 100755
--- a/website/search.php
+++ b/website/search.php
@@ -37,26 +37,33 @@
 
 	// Show / use polygons
 	$bShowPolygons = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
-    if ($sOutputFormat == 'html') {
+	if ($sOutputFormat == 'html')
+	{
 		$bAsText = $bShowPolygons;
 		$bShowPolygons = false;
 		$bAsGeoJSON = false;
 		$bAsKML = false;
 		$bAsSVG = false;
-	} else {
+	}
+	else
+	{
 		$bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
 		$bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
 		$bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
 		$bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
 		if ((($bShowPolygons?1:0)
-		   + ($bAsGeoJSON?1:0)
-		   + ($bAsKML?1:0)
-		   + ($bAsSVG?1:0)
-		   + ($bAsText?1:0)
-			) > CONST_PolygonOutput_MaximumTypes) {
-			if (CONST_PolygonOutput_MaximumTypes) {
+					+ ($bAsGeoJSON?1:0)
+					+ ($bAsKML?1:0)
+					+ ($bAsSVG?1:0)
+					+ ($bAsText?1:0)
+			) > CONST_PolygonOutput_MaximumTypes)
+		{
+			if (CONST_PolygonOutput_MaximumTypes)
+			{
 				userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
-			} else {
+			}
+			else
+			{
 				userError("Polygon output is disabled");
 			}
 			exit;
@@ -66,7 +73,7 @@
 	// Show address breakdown
 	$bShowAddressDetails = isset($_GET['addressdetails']) && $_GET['addressdetails'];
 
-	// Preferred language	
+	// Preferred language
 	$aLangPrefOrder = getPreferredLanguages();
 	if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
 	if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
@@ -119,7 +126,7 @@
 		}
 		$sCountryCodesSQL = join(',', $aCountryCodes);
 	}
-		
+
 	// Search query
 	$sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
 	if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
@@ -127,8 +134,8 @@
 		$sQuery = substr($_SERVER['PATH_INFO'], 1);
 
 		// reverse order of '/' separated string
-		$aPhrases = explode('/', $sQuery);		
-		$aPhrases = array_reverse($aPhrases); 
+		$aPhrases = explode('/', $sQuery);
+		$aPhrases = array_reverse($aPhrases);
 		$sQuery = join(', ',$aPhrases);
 	}
 
@@ -138,7 +145,8 @@
 		$sValue = trim($_GET[$sKey]);
 		if (!$sValue) return false;
 		$aStructuredQuery[$sKey] = $sValue;
-		if ($iMinAddressRank == 0 && $iMaxAddressRank == 30) {
+		if ($iMinAddressRank == 0 && $iMaxAddressRank == 30)
+		{
 			$iMinAddressRank = $iNewMinAddressRank;
 			$iMaxAddressRank = $iNewMaxAddressRank;
 		}
@@ -161,7 +169,8 @@
 	{
 		loadStructuredAddressElement($aStructuredQuery, $iMinAddressRank, $iMaxAddressRank, $_GET, $aStructuredOption[0], $aStructuredOption[1], $aStructuredOption[2]);
 	}
-	if (sizeof($aStructuredQuery) > 0) {
+	if (sizeof($aStructuredQuery) > 0) 
+	{
 		$sQuery = join(', ', $aStructuredQuery);
 		if ($iMaxAddressRank < 30)
 		{
@@ -174,8 +183,8 @@
 		$hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder);
 
 		// Hack to make it handle "new york, ny" (and variants) correctly
-                $sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $sQuery);
-		if (isset($aLangPrefOrder['name:en']))		
+		$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $sQuery);
+		if (isset($aLangPrefOrder['name:en']))
 		{
 			$sQuery = preg_replace('/,\s*il\s*(,|$)/',', illinois\1', $sQuery);
 			$sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery);
@@ -183,7 +192,7 @@
 		}
 
 		// If we have a view box create the SQL
-		// Small is the actual view box, Large is double (on each axis) that 
+		// Small is the actual view box, Large is double (on each axis) that
 		$sViewboxCentreSQL = $sViewboxSmallSQL = $sViewboxLargeSQL = false;
 		if (isset($_GET['viewboxlbrt']) && $_GET['viewboxlbrt'])
 		{
@@ -201,7 +210,9 @@
 			$aCoOrdinates[1] += $fWidth;
 			$aCoOrdinates[3] -= $fWidth;
 			$sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aCoOrdinates[0].",".(float)$aCoOrdinates[1]."),ST_Point(".(float)$aCoOrdinates[2].",".(float)$aCoOrdinates[3].")),4326)";
-		} else {
+		}
+		else
+		{
 			$bBoundingBoxSearch = false;
 		}
 		if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth'])
@@ -286,8 +297,8 @@
 			// Start with a blank search
 			$aSearches = array(
 				array('iSearchRank' => 0, 'iNamePhrase' => -1, 'sCountryCode' => false, 'aName'=>array(), 'aAddress'=>array(), 'aFullNameAddress'=>array(),
-					'aNameNonSearch'=>array(), 'aAddressNonSearch'=>array(),
-					'sOperator'=>'', 'aFeatureName' => array(), 'sClass'=>'', 'sType'=>'', 'sHouseNumber'=>'', 'fLat'=>'', 'fLon'=>'', 'fRadius'=>'')
+				      'aNameNonSearch'=>array(), 'aAddressNonSearch'=>array(),
+				      'sOperator'=>'', 'aFeatureName' => array(), 'sClass'=>'', 'sType'=>'', 'sHouseNumber'=>'', 'fLat'=>'', 'fLon'=>'', 'fRadius'=>'')
 			);
 
 			$sNearPointSQL = false;
@@ -364,7 +375,7 @@
 			// Convert each phrase to standard form
 			// Create a list of standard words
 			// Get all 'sets' of words
-			// Generate a complete list of all 
+			// Generate a complete list of all
 			$aTokens = array();
 			foreach($aPhrases as $iPhrase => $sPhrase)
 			{
@@ -395,122 +406,120 @@
 			if (sizeof($aTokens))
 			{
 
-			// Check which tokens we have, get the ID numbers			
-			$sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count';
-			$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
-//			$sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency;
-//			$sSQL .= ' group by word_token, word, class, type, country_code';
+				// Check which tokens we have, get the ID numbers
+				$sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count';
+				$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
+				//$sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency;
+				//$sSQL .= ' group by word_token, word, class, type, country_code';
 
-			if (CONST_Debug) var_Dump($sSQL);
-
-			$aValidTokens = array();
-			if (sizeof($aTokens))
-				$aDatabaseWords = $oDB->getAll($sSQL);
-			else
-				$aDatabaseWords = array();
-			if (PEAR::IsError($aDatabaseWords))
-			{
-				failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
-			}
-			$aPossibleMainWordIDs = array();
-			$aWordFrequencyScores = array();
-			foreach($aDatabaseWords as $aToken)
-			{
-				// Very special case - require 2 letter country param to match the country code found
-				if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country']) 
-                                  && strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code'])
-				{
-					continue;
-				}
+				if (CONST_Debug) var_Dump($sSQL);
 
-				if (isset($aValidTokens[$aToken['word_token']]))
+				$aValidTokens = array();
+				if (sizeof($aTokens)) $aDatabaseWords = $oDB->getAll($sSQL);
+				else $aDatabaseWords = array();
+				if (PEAR::IsError($aDatabaseWords))
 				{
-					$aValidTokens[$aToken['word_token']][] = $aToken;
+					failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
 				}
-				else
+				$aPossibleMainWordIDs = array();
+				$aWordFrequencyScores = array();
+				foreach($aDatabaseWords as $aToken)
 				{
-					$aValidTokens[$aToken['word_token']] = array($aToken);
-				}
-				if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
-				$aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
-			}
-			if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
+					// Very special case - require 2 letter country param to match the country code found
+					if ($bStructuredPhrases && $aToken['country_code'] && !empty($aStructuredQuery['country'])
+							&& strlen($aStructuredQuery['country']) == 2 && strtolower($aStructuredQuery['country']) != $aToken['country_code'])
+					{
+						continue;
+					}
 
-                        $aSuggestion = array();
-                        $bSuggestion = false;
-			if (CONST_Suggestions_Enabled)
-			{
-				foreach($aPhrases as $iPhrase => $aPhrase)
-				{
-                	                if (!isset($aValidTokens[' '.$aPhrase['wordsets'][0][0]]))
-                        	        {
-                                	        $sQuotedPhrase = getDBQuoted(' '.$aPhrase['wordsets'][0][0]);
-						$aSuggestionWords = getWordSuggestions($oDB, $aPhrase['wordsets'][0][0]);
-						$aRow = $aSuggestionWords[0];
-						if ($aRow && $aRow['word'])
-                	                        {
-                        	                        $aSuggestion[] = $aRow['word'];
-                                	                $bSuggestion = true;
-                                        	}
-	                                        else
-        	                                {
-                	                                $aSuggestion[] = $aPhrase['string'];
-                        	                }
-	                                }
-        	                        else
-                	                {
-                        	                $aSuggestion[] = $aPhrase['string'];
-                                	}
+					if (isset($aValidTokens[$aToken['word_token']]))
+					{
+						$aValidTokens[$aToken['word_token']][] = $aToken;
+					}
+					else
+					{
+						$aValidTokens[$aToken['word_token']] = array($aToken);
+					}
+					if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
+					$aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
 				}
-			}
-			if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
+				if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 
-			// Try and calculate GB postcodes we might be missing
-			foreach($aTokens as $sToken)
-			{
-				// Source of gb postcodes is now definitive - always use
-				if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData))
+				$aSuggestion = array();
+				$bSuggestion = false;
+				if (CONST_Suggestions_Enabled)
 				{
-					if (substr($aData[1],-2,1) != ' ')
+					foreach($aPhrases as $iPhrase => $aPhrase)
 					{
-						$aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1));
-						$aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1);
+						if (!isset($aValidTokens[' '.$aPhrase['wordsets'][0][0]]))
+						{
+							$sQuotedPhrase = getDBQuoted(' '.$aPhrase['wordsets'][0][0]);
+							$aSuggestionWords = getWordSuggestions($oDB, $aPhrase['wordsets'][0][0]);
+							$aRow = $aSuggestionWords[0];
+							if ($aRow && $aRow['word'])
+							{
+								$aSuggestion[] = $aRow['word'];
+								$bSuggestion = true;
+							}
+							else
+							{
+								$aSuggestion[] = $aPhrase['string'];
+							}
+						}
+						else
+						{
+							$aSuggestion[] = $aPhrase['string'];
+						}
 					}
-					$aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $oDB);
-					if ($aGBPostcodeLocation)
+				}
+				if ($bSuggestion) $sSuggestion = join(', ',$aSuggestion);
+
+				// Try and calculate GB postcodes we might be missing
+				foreach($aTokens as $sToken)
+				{
+					// Source of gb postcodes is now definitive - always use
+					if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData))
 					{
-						$aValidTokens[$sToken] = $aGBPostcodeLocation;
+						if (substr($aData[1],-2,1) != ' ')
+						{
+							$aData[0] = substr($aData[0],0,strlen($aData[1]-1)).' '.substr($aData[0],strlen($aData[1]-1));
+							$aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1);
+						}
+						$aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $oDB);
+						if ($aGBPostcodeLocation)
+						{
+							$aValidTokens[$sToken] = $aGBPostcodeLocation;
+						}
 					}
 				}
-			}
 
-			foreach($aTokens as $sToken)
-			{
-				// Unknown single word token with a number - assume it is a house number
-				if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken))
+				foreach($aTokens as $sToken)
 				{
-					$aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
+					// Unknown single word token with a number - assume it is a house number
+					if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken))
+					{
+						$aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
+					}
 				}
-			}
 
-			// Any words that have failed completely?
-			// TODO: suggestions
+				// Any words that have failed completely?
+				// TODO: suggestions
 
-			// Start the search process
-			$aResultPlaceIDs = array();
+				// Start the search process
+				$aResultPlaceIDs = array();
 
-			/*
-				Calculate all searches using aValidTokens i.e.
+				/*
+				   Calculate all searches using aValidTokens i.e.
 
-				'Wodsworth Road, Sheffield' =>
+				   'Wodsworth Road, Sheffield' =>
 
-				Phrase Wordset
-				0      0       (wodsworth road)
-				0      1       (wodsworth)(road)
-				1      0       (sheffield)
+				   Phrase Wordset
+				   0      0       (wodsworth road)
+				   0      1       (wodsworth)(road)
+				   1      0       (sheffield)
 
-				Score how good the search is so they can be ordered
-			*/
+				   Score how good the search is so they can be ordered
+				 */
 				foreach($aPhrases as $iPhrase => $sPhrase)
 				{
 					$aNewPhraseSearches = array();
@@ -524,14 +533,14 @@
 						// Add all words from this wordset
 						foreach($aWordset as $iToken => $sToken)
 						{
-//echo "<br><b>$sToken</b>";
+							//echo "<br><b>$sToken</b>";
 							$aNewWordsetSearches = array();
 
 							foreach($aWordsetSearches as $aCurrentSearch)
 							{
-//echo "<i>";
-//var_dump($aCurrentSearch);
-//echo "</i>";
+								//echo "<i>";
+								//var_dump($aCurrentSearch);
+								//echo "</i>";
 
 								// If the token is valid
 								if (isset($aValidTokens[' '.$sToken]))
@@ -571,12 +580,12 @@
 											{
 												$aSearch['sHouseNumber'] = $sToken;
 												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-/*
+												/*
 												// Fall back to not searching for this item (better than nothing)
 												$aSearch = $aCurrentSearch;
 												$aSearch['iSearchRank'] += 1;
 												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
-*/
+												 */
 											}
 										}
 										elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null)
@@ -621,7 +630,7 @@
 											else
 											{
 												$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-//												$aSearch['iNamePhrase'] = $iPhrase;
+												//$aSearch['iNamePhrase'] = $iPhrase;
 											}
 											if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 										}
@@ -636,38 +645,38 @@
 										{
 											if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strlen($sToken) >= 4)
 											{
-	  											$aSearch = $aCurrentSearch;
+												$aSearch = $aCurrentSearch;
 												$aSearch['iSearchRank'] += 1;
 												if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
 												{
 													$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-		  											if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
+													if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 												}
 												elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version?
 												{
 													foreach($aValidTokens[' '.$sToken] as $aSearchTermToken)
 													{
-														if (empty($aSearchTermToken['country_code']) 
-															&& empty($aSearchTermToken['lat'])
-															&& empty($aSearchTermToken['class']))
+														if (empty($aSearchTermToken['country_code'])
+																&& empty($aSearchTermToken['lat'])
+																&& empty($aSearchTermToken['class']))
 														{
-	  														$aSearch = $aCurrentSearch;
+															$aSearch = $aCurrentSearch;
 															$aSearch['iSearchRank'] += 1;
 															$aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id'];
-				  											if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
+															if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 														}
 													}
 												}
 												else
 												{
 													$aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
-		  											if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
+													if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 												}
 											}
 
 											if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase)
 											{
-	  											$aSearch = $aCurrentSearch;
+												$aSearch = $aCurrentSearch;
 												$aSearch['iSearchRank'] += 2;
 												if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
 												if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
@@ -675,7 +684,7 @@
 												else
 													$aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
 												$aSearch['iNamePhrase'] = $iPhrase;
-  												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
+												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 											}
 										}
 									}
@@ -691,25 +700,19 @@
 							// Sort and cut
 							usort($aNewWordsetSearches, 'bySearchRank');
 							$aWordsetSearches = array_slice($aNewWordsetSearches, 0, 50);
-						}						
-//						var_Dump('<hr>',sizeof($aWordsetSearches)); exit;
+						}
+						//var_Dump('<hr>',sizeof($aWordsetSearches)); exit;
 
 						$aNewPhraseSearches = array_merge($aNewPhraseSearches, $aNewWordsetSearches);
 						usort($aNewPhraseSearches, 'bySearchRank');
 
-          $aSearchHash = array();
-          foreach($aNewPhraseSearches as $iSearch => $aSearch)
-          {
-            $sHash = serialize($aSearch);
-            if (isset($aSearchHash[$sHash]))
-            {
-              unset($aNewPhraseSearches[$iSearch]);
-            }
-            else
-            {
-              $aSearchHash[$sHash] = 1;
-            }
-          }
+						$aSearchHash = array();
+						foreach($aNewPhraseSearches as $iSearch => $aSearch)
+						{
+							$sHash = serialize($aSearch);
+							if (isset($aSearchHash[$sHash])) unset($aNewPhraseSearches[$iSearch]);
+							else $aSearchHash[$sHash] = 1;
+						}
 
 						$aNewPhraseSearches = array_slice($aNewPhraseSearches, 0, 50);
 					}
@@ -735,141 +738,141 @@
 						if ($iSearchCount > 50) break;
 					}
 
-//					if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
+					//if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
 
 				}
 			}
 			else
 			{
-					// Re-group the searches by their score, junk anything over 20 as just not worth trying
-					$aGroupedSearches = array();
-					foreach($aSearches as $aSearch)
+				// Re-group the searches by their score, junk anything over 20 as just not worth trying
+				$aGroupedSearches = array();
+				foreach($aSearches as $aSearch)
+				{
+					if ($aSearch['iSearchRank'] < $iMaxRank)
 					{
-						if ($aSearch['iSearchRank'] < $iMaxRank)
-						{
-							if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
-							$aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
-						}
+						if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
+						$aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
 					}
-					ksort($aGroupedSearches);
+				}
+				ksort($aGroupedSearches);
 			}
-				
-				if (CONST_Debug) var_Dump($aGroupedSearches);
 
-				if ($bReverseInPlan)
+			if (CONST_Debug) var_Dump($aGroupedSearches);
+
+			if ($bReverseInPlan)
+			{
+				$aCopyGroupedSearches = $aGroupedSearches;
+				foreach($aCopyGroupedSearches as $iGroup => $aSearches)
 				{
-					$aCopyGroupedSearches = $aGroupedSearches;
-					foreach($aCopyGroupedSearches as $iGroup => $aSearches)
+					foreach($aSearches as $iSearch => $aSearch)
 					{
-						foreach($aSearches as $iSearch => $aSearch)
+						if (sizeof($aSearch['aAddress']))
 						{
-							if (sizeof($aSearch['aAddress']))
+							$iReverseItem = array_pop($aSearch['aAddress']);
+							if (isset($aPossibleMainWordIDs[$iReverseItem]))
 							{
-								$iReverseItem = array_pop($aSearch['aAddress']);
-								if (isset($aPossibleMainWordIDs[$iReverseItem]))
-								{
-									$aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']);
-									$aSearch['aName'] = array($iReverseItem);
-									$aGroupedSearches[$iGroup][] = $aSearch;
-								}
-//								$aReverseSearch['aName'][$iReverseItem] = $iReverseItem;
-	//							$aGroupedSearches[$iGroup][] = $aReverseSearch;
+								$aSearch['aAddress'] = array_merge($aSearch['aAddress'], $aSearch['aName']);
+								$aSearch['aName'] = array($iReverseItem);
+								$aGroupedSearches[$iGroup][] = $aSearch;
 							}
+							//$aReverseSearch['aName'][$iReverseItem] = $iReverseItem;
+							//$aGroupedSearches[$iGroup][] = $aReverseSearch;
 						}
 					}
 				}
+			}
 
-				if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0)
+			if (CONST_Search_TryDroppedAddressTerms && sizeof($aStructuredQuery) > 0)
+			{
+				$aCopyGroupedSearches = $aGroupedSearches;
+				foreach($aCopyGroupedSearches as $iGroup => $aSearches)
 				{
-					$aCopyGroupedSearches = $aGroupedSearches;
-					foreach($aCopyGroupedSearches as $iGroup => $aSearches)
+					foreach($aSearches as $iSearch => $aSearch)
 					{
-						foreach($aSearches as $iSearch => $aSearch)
+						$aReductionsList = array($aSearch['aAddress']);
+						$iSearchRank = $aSearch['iSearchRank'];
+						while(sizeof($aReductionsList) > 0)
 						{
-							$aReductionsList = array($aSearch['aAddress']);
-							$iSearchRank = $aSearch['iSearchRank'];
-							while(sizeof($aReductionsList) > 0)
+							$iSearchRank += 5;
+							if ($iSearchRank > iMaxRank) break 3;
+							$aNewReductionsList = array();
+							foreach($aReductionsList as $aReductionsWordList)
 							{
-								$iSearchRank += 5;
-								if ($iSearchRank > iMaxRank) break 3;
-								$aNewReductionsList = array();
-								foreach($aReductionsList as $aReductionsWordList)
+								for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++)
 								{
-									for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++)
+									$aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
+									$aReverseSearch = $aSearch;
+									$aSearch['aAddress'] = $aReductionsWordListResult;
+									$aSearch['iSearchRank'] = $iSearchRank;
+									$aGroupedSearches[$iSearchRank][] = $aReverseSearch;
+									if (sizeof($aReductionsWordListResult) > 0)
 									{
-										$aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
-										$aReverseSearch = $aSearch;
-										$aSearch['aAddress'] = $aReductionsWordListResult;
-										$aSearch['iSearchRank'] = $iSearchRank;
-										$aGroupedSearches[$iSearchRank][] = $aReverseSearch;
-										if (sizeof($aReductionsWordListResult) > 0)
-										{
-											$aNewReductionsList[] = $aReductionsWordListResult;
-										}
+										$aNewReductionsList[] = $aReductionsWordListResult;
 									}
 								}
-								$aReductionsList = $aNewReductionsList;
 							}
+							$aReductionsList = $aNewReductionsList;
 						}
 					}
-					ksort($aGroupedSearches);
 				}
+				ksort($aGroupedSearches);
+			}
 
-				// Filter out duplicate searches
-				$aSearchHash = array();
-				foreach($aGroupedSearches as $iGroup => $aSearches)
+			// Filter out duplicate searches
+			$aSearchHash = array();
+			foreach($aGroupedSearches as $iGroup => $aSearches)
+			{
+				foreach($aSearches as $iSearch => $aSearch)
 				{
-					foreach($aSearches as $iSearch => $aSearch)
+					$sHash = serialize($aSearch);
+					if (isset($aSearchHash[$sHash]))
 					{
-						$sHash = serialize($aSearch);
-						if (isset($aSearchHash[$sHash]))
-						{
-							unset($aGroupedSearches[$iGroup][$iSearch]);
-							if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);
-						}
-						else
-						{
-							$aSearchHash[$sHash] = 1;
-						}
+						unset($aGroupedSearches[$iGroup][$iSearch]);
+						if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);
+					}
+					else
+					{
+						$aSearchHash[$sHash] = 1;
 					}
 				}
+			}
 
-				if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
+			if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
 
-				$iGroupLoop = 0;
-				$iQueryLoop = 0;
-				foreach($aGroupedSearches as $iGroupedRank => $aSearches)
+			$iGroupLoop = 0;
+			$iQueryLoop = 0;
+			foreach($aGroupedSearches as $iGroupedRank => $aSearches)
+			{
+				$iGroupLoop++;
+				foreach($aSearches as $aSearch)
 				{
-					$iGroupLoop++;
-					foreach($aSearches as $aSearch)
-					{
-						$iQueryLoop++;
+					$iQueryLoop++;
 
-						if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
-						if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
+					if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
+					if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
 
 
-						// Must have a location term
-						if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
+					// Must have a location term
+					if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
+					{
+						if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
 						{
-							if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
+							if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank)
 							{
-								if (4 >= $iMinAddressRank && 4 <= $iMaxAddressRank)
-								{
-									$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
-									if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-									$sSQL .= " order by st_area(geometry) desc limit 1";
-									if (CONST_Debug) var_dump($sSQL);
-									$aPlaceIDs = $oDB->getCol($sSQL);
-								}
+								$sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
+								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
+								$sSQL .= " order by st_area(geometry) desc limit 1";
+								if (CONST_Debug) var_dump($sSQL);
+								$aPlaceIDs = $oDB->getCol($sSQL);
 							}
-							else
+						}
+						else
+						{
+							if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
+							if (!$aSearch['sClass']) continue;
+							$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
+							if ($oDB->getOne($sSQL))
 							{
-								if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
-								if (!$aSearch['sClass']) continue;
-								$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-								if ($oDB->getOne($sSQL))
-								{
 								$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 								if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
 								$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)";
@@ -878,7 +881,7 @@
 								{
 									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
 								}
-								if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
+								if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
 								$sSQL .= " limit $iLimit";
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
@@ -892,7 +895,7 @@
 									if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
 									$sSQL .= " where st_contains($sViewboxLargeSQL, ct.centroid)";
 									if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-									if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
+									if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
 									$sSQL .= " limit $iLimit";
 									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $oDB->getCol($sSQL);
@@ -908,204 +911,202 @@
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
 							}
-							}
 						}
-						else
-						{
-							$aPlaceIDs = array();
+					}
+					else
+					{
+						$aPlaceIDs = array();
 
-							// First we need a position, either aName or fLat or both
-							$aTerms = array();
-							$aOrder = array();
+						// First we need a position, either aName or fLat or both
+						$aTerms = array();
+						$aOrder = array();
 
-							// TODO: filter out the pointless search terms (2 letter name tokens and less)
-							// they might be right - but they are just too darned expensive to run
-							if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
-							if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
-							if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) 
-							{
-								// For infrequent name terms disable index usage for address
-								if (CONST_Search_NameOnlySearchFrequencyThreshold && 
-									sizeof($aSearch['aName']) == 1 && 
+						// TODO: filter out the pointless search terms (2 letter name tokens and less)
+						// they might be right - but they are just too darned expensive to run
+						if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
+						if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
+						if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress'])
+						{
+							// For infrequent name terms disable index usage for address
+							if (CONST_Search_NameOnlySearchFrequencyThreshold &&
+									sizeof($aSearch['aName']) == 1 &&
 									$aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold)
-								{
-									$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
-								}
-								else
-								{
-									$aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
-									if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
-								}
+							{
+								$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
 							}
-							if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-							if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank in (26,27)";
-							if ($aSearch['fLon'] && $aSearch['fLat'])
+							else
 							{
-								$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
-								$aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
+								$aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
+								if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
 							}
-							if (sizeof($aExcludePlaceIDs))
+						}
+						if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
+						if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank in (26,27)";
+						if ($aSearch['fLon'] && $aSearch['fLat'])
+						{
+							$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
+							$aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
+						}
+						if (sizeof($aExcludePlaceIDs))
+						{
+							$aTerms[] = "place_id not in (".join(',',$aExcludePlaceIDs).")";
+						}
+						if ($sCountryCodesSQL)
+						{
+							$aTerms[] = "country_code in ($sCountryCodesSQL)";
+						}
+
+						if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
+						if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
+
+						$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+						if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
+						if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
+						$aOrder[] = "$sImportanceSQL DESC";
+						if (sizeof($aSearch['aFullNameAddress']))
+							$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
+
+						if (sizeof($aTerms))
+						{
+							$sSQL = "select place_id";
+							$sSQL .= " from search_name";
+							$sSQL .= " where ".join(' and ',$aTerms);
+							$sSQL .= " order by ".join(', ',$aOrder);
+							if ($aSearch['sHouseNumber'] || $aSearch['sClass'])
+								$sSQL .= " limit 50";
+							elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass'])
+								$sSQL .= " limit 1";
+							else
+								$sSQL .= " limit ".$iLimit;
+
+							if (CONST_Debug) { var_dump($sSQL); }
+							$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
+							if (PEAR::IsError($aViewBoxPlaceIDs))
 							{
-								$aTerms[] = "place_id not in (".join(',',$aExcludePlaceIDs).")";
+								failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
 							}
-							if ($sCountryCodesSQL)
+							//var_dump($aViewBoxPlaceIDs);
+							// Did we have an viewbox matches?
+							$aPlaceIDs = array();
+							$bViewBoxMatch = false;
+							foreach($aViewBoxPlaceIDs as $aViewBoxRow)
 							{
-								$aTerms[] = "country_code in ($sCountryCodesSQL)";
+								//if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break;
+								//if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break;
+								//if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;
+								//else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2;
+								$aPlaceIDs[] = $aViewBoxRow['place_id'];
 							}
+						}
+						//var_Dump($aPlaceIDs);
+						//exit;
 
-							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
-							if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
-
-							$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
-							if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
-							if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
-							$aOrder[] = "$sImportanceSQL DESC";
-							if (sizeof($aSearch['aFullNameAddress']))
-								$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
+						if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
+						{
+							$aRoadPlaceIDs = $aPlaceIDs;
+							$sPlaceIDs = join(',',$aPlaceIDs);
 
-						
-							if (sizeof($aTerms))
+							// Now they are indexed look for a house attached to a street we found
+							$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';
+							$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
+							if (sizeof($aExcludePlaceIDs))
 							{
-								$sSQL = "select place_id";
-								$sSQL .= " from search_name";
-								$sSQL .= " where ".join(' and ',$aTerms);
-								$sSQL .= " order by ".join(', ',$aOrder);
-								if ($aSearch['sHouseNumber'] || $aSearch['sClass'])
-									$sSQL .= " limit 50";
-								elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass'])
-									$sSQL .= " limit 1";
-								else
-									$sSQL .= " limit ".$iLimit;
+								$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
+							}
+							$sSQL .= " limit $iLimit";
+							if (CONST_Debug) var_dump($sSQL);
+							$aPlaceIDs = $oDB->getCol($sSQL);
 
-								if (CONST_Debug) { var_dump($sSQL); }
-								$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
-								if (PEAR::IsError($aViewBoxPlaceIDs))
-								{
-									failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
-								}
-//var_dump($aViewBoxPlaceIDs);
-								// Did we have an viewbox matches?
-								$aPlaceIDs = array();
-								$bViewBoxMatch = false;
-								foreach($aViewBoxPlaceIDs as $aViewBoxRow)
+							// If not try the aux fallback table
+							if (!sizeof($aPlaceIDs))
+							{
+								$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
+								if (sizeof($aExcludePlaceIDs))
 								{
-//									if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break;
-//									if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break;
-//									if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;
-//									else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2;
-									$aPlaceIDs[] = $aViewBoxRow['place_id'];
+									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
 								}
+								//$sSQL .= " limit $iLimit";
+								if (CONST_Debug) var_dump($sSQL);
+								$aPlaceIDs = $oDB->getCol($sSQL);
 							}
-//var_Dump($aPlaceIDs);
-//exit;
 
-							if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
+							if (!sizeof($aPlaceIDs))
 							{
-								$aRoadPlaceIDs = $aPlaceIDs;
-								$sPlaceIDs = join(',',$aPlaceIDs);
-	
-								// Now they are indexed look for a house attached to a street we found
-								$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';						
-								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
+								$sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
 								if (sizeof($aExcludePlaceIDs))
 								{
 									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
 								}
-								$sSQL .= " limit $iLimit";
+								//$sSQL .= " limit $iLimit";
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
+							}
 
-								// If not try the aux fallback table
-								if (!sizeof($aPlaceIDs))
-								{
-									$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
-									if (sizeof($aExcludePlaceIDs))
-									{
-										$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-									}
-//									$sSQL .= " limit $iLimit";
-									if (CONST_Debug) var_dump($sSQL);
-									$aPlaceIDs = $oDB->getCol($sSQL);
-								}
+							// Fallback to the road
+							if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))
+							{
+								$aPlaceIDs = $aRoadPlaceIDs;
+							}
 
-								if (!sizeof($aPlaceIDs))
-								{
-									$sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
-									if (sizeof($aExcludePlaceIDs))
-									{
-										$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
-									}
-//									$sSQL .= " limit $iLimit";
-									if (CONST_Debug) var_dump($sSQL);
-									$aPlaceIDs = $oDB->getCol($sSQL);
-								}
+						}
 
-								// Fallback to the road
-								if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))
-								{
-									$aPlaceIDs = $aRoadPlaceIDs;
-								}
-								
+						if ($aSearch['sClass'] && sizeof($aPlaceIDs))
+						{
+							$sPlaceIDs = join(',',$aPlaceIDs);
+							$aClassPlaceIDs = array();
+
+							if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
+							{
+								// If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
+								$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
+								$sSQL .= " and linked_place_id is null";
+								if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
+								$sSQL .= " order by rank_search asc limit $iLimit";
+								if (CONST_Debug) var_dump($sSQL);
+								$aClassPlaceIDs = $oDB->getCol($sSQL);
 							}
-						
-							if ($aSearch['sClass'] && sizeof($aPlaceIDs))
+
+							if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
 							{
-								$sPlaceIDs = join(',',$aPlaceIDs);
+								$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
+								$bCacheTable = $oDB->getOne($sSQL);
 
-								$aClassPlaceIDs = array();
+								$sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
 
-								if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
+								if (CONST_Debug) var_dump($sSQL);
+								$iMaxRank = ((int)$oDB->getOne($sSQL));
+
+								// For state / country level searches the normal radius search doesn't work very well
+								$sPlaceGeom = false;
+								if ($iMaxRank < 9 && $bCacheTable)
 								{
-									// If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
-									$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-									$sSQL .= " and linked_place_id is null";
-									if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-									$sSQL .= " order by rank_search asc limit $iLimit";
+									// Try and get a polygon to search in instead
+									$sSQL = "select geometry from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank + 5 and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon') order by rank_search asc limit 1";
 									if (CONST_Debug) var_dump($sSQL);
-									$aClassPlaceIDs = $oDB->getCol($sSQL);
+									$sPlaceGeom = $oDB->getOne($sSQL);
 								}
-								
-								if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
-								{
-									$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-									$bCacheTable = $oDB->getOne($sSQL);
-
-									$sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
 
+								if ($sPlaceGeom)
+								{
+									$sPlaceIDs = false;
+								}
+								else
+								{
+									$iMaxRank += 5;
+									$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
 									if (CONST_Debug) var_dump($sSQL);
-									$iMaxRank = ((int)$oDB->getOne($sSQL));
-
-									// For state / country level searches the normal radius search doesn't work very well
-									$sPlaceGeom = false;
-									if ($iMaxRank < 9 && $bCacheTable)
-									{
-										// Try and get a polygon to search in instead
-										$sSQL = "select geometry from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank + 5 and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon') order by rank_search asc limit 1";
-										if (CONST_Debug) var_dump($sSQL);
-										$sPlaceGeom = $oDB->getOne($sSQL);
-									}
-									
-									if ($sPlaceGeom)
-									{
-										$sPlaceIDs = false;
-									}
-									else
-									{
-										$iMaxRank += 5;
-										$sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
-										if (CONST_Debug) var_dump($sSQL);
-										$aPlaceIDs = $oDB->getCol($sSQL);
-										$sPlaceIDs = join(',',$aPlaceIDs);
-									}
+									$aPlaceIDs = $oDB->getCol($sSQL);
+									$sPlaceIDs = join(',',$aPlaceIDs);
+								}
 
-									if ($sPlaceIDs || $sPlaceGeom)
-									{
+								if ($sPlaceIDs || $sPlaceGeom)
+								{
 
 									$fRange = 0.01;
 									if ($bCacheTable)
 									{
 										// More efficient - can make the range bigger
-	 									$fRange = 0.05;
+										$fRange = 0.05;
 
 										$sOrderBySQL = '';
 										if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)";
@@ -1150,199 +1151,199 @@
 										{
 											$sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
 										}
-										if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";								
+										if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";
 										if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
 										if ($iOffset) $sSQL .= " offset $iOffset";
 										$sSQL .= " limit $iLimit";
 										if (CONST_Debug) var_dump($sSQL);
 										$aClassPlaceIDs = array_merge($aClassPlaceIDs, $oDB->getCol($sSQL));
 									}
-									}
 								}
-
-								$aPlaceIDs = $aClassPlaceIDs;
-
 							}
-						
-						}
 
-						if (PEAR::IsError($aPlaceIDs))
-						{
-							failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
-						}
+							$aPlaceIDs = $aClassPlaceIDs;
 
-						if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
-
-						foreach($aPlaceIDs as $iPlaceID)
-						{
-							$aResultPlaceIDs[$iPlaceID] = $iPlaceID;
 						}
-						if ($iQueryLoop > 20) break;
-					}
 
-					//exit;
-					if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
-					if ($iGroupLoop > 4) break;
-					if ($iQueryLoop > 30) break;
-				}
+					}
 
-				// Did we find anything?	
-				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
-				{
-//var_Dump($aResultPlaceIDs);exit;
-					// Get the details for display (is this a redundant extra step?)
-					$sPlaceIDs = join(',',$aResultPlaceIDs);
-					$sOrderSQL = 'CASE ';
-					foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+					if (PEAR::IsError($aPlaceIDs))
 					{
-						$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
+						failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
 					}
-					$sOrderSQL .= ' ELSE 10000000 END';
-					$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-					$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-					$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-					$sSQL .= "(extratags->'place') as extra_place ";
-					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-					if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-					$sSQL .= ") ";
-					if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
-					$sSQL .= "and linked_place_id is null ";
-					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",langaddress ";
-					$sSQL .= ",placename ";
-					$sSQL .= ",ref ";
-					$sSQL .= ",extratags->'place' ";
-					$sSQL .= " union ";
-					$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.15 as importance, ";
-					$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= " union ";
-					$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.10 as importance, ";
-					$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-					$sSQL .= "order by importance desc";
-//					$sSQL .= "order by rank_search,rank_address,porder asc";
-					if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
-					$aSearchResults = $oDB->getAll($sSQL);
-//var_dump($sSQL,$aSearchResults);exit;
-
-					if (PEAR::IsError($aSearchResults))
+
+					if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
+
+					foreach($aPlaceIDs as $iPlaceID)
 					{
-						failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
+						$aResultPlaceIDs[$iPlaceID] = $iPlaceID;
 					}
+					if ($iQueryLoop > 20) break;
 				}
-			} // end if ($sQuery)
-			else
+
+				//exit;
+				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
+				if ($iGroupLoop > 4) break;
+				if ($iQueryLoop > 30) break;
+			}
+
+			// Did we find anything?
+			if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
 			{
-				if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
+				//var_Dump($aResultPlaceIDs);exit;
+				// Get the details for display (is this a redundant extra step?)
+				$sPlaceIDs = join(',',$aResultPlaceIDs);
+				$sOrderSQL = 'CASE ';
+				foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+				{
+					$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
+				}
+				$sOrderSQL .= ' ELSE 10000000 END';
+				$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+				$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
+				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+				$sSQL .= "(extratags->'place') as extra_place ";
+				$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+				if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
+				$sSQL .= ") ";
+				if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
+				$sSQL .= "and linked_place_id is null ";
+				$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= ",langaddress ";
+				$sSQL .= ",placename ";
+				$sSQL .= ",ref ";
+				$sSQL .= ",extratags->'place' ";
+				$sSQL .= " union ";
+				$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "null as placename,";
+				$sSQL .= "null as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "-0.15 as importance, ";
+				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+				$sSQL .= "null as extra_place ";
+				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "group by place_id";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= " union ";
+				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "null as placename,";
+				$sSQL .= "null as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "-0.10 as importance, ";
+				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+				$sSQL .= "null as extra_place ";
+				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "group by place_id";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+				$sSQL .= "order by importance desc";
+				//$sSQL .= "order by rank_search,rank_address,porder asc";
+				if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
+				$aSearchResults = $oDB->getAll($sSQL);
+				//var_dump($sSQL,$aSearchResults);exit;
+
+				if (PEAR::IsError($aSearchResults))
 				{
-					$iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
-					$aResultPlaceIDs = array($iPlaceID);
+					failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
+				}
+			}
+		} // end if ($sQuery)
+		else
+		{
+			if (isset($_GET['nearlat']) && trim($_GET['nearlat'])!=='' && isset($_GET['nearlon']) && trim($_GET['nearlon']) !== '')
+			{
+				$iPlaceID = geocodeReverse($_GET['nearlat'], $_GET['nearlon']);
+				$aResultPlaceIDs = array($iPlaceID);
 
-					// TODO: this needs refactoring!
+				// TODO: this needs refactoring!
 
-					// Get the details for display (is this a redundant extra step?)
-					$sPlaceIDs = join(',',$aResultPlaceIDs);
-					$sOrderSQL = 'CASE ';
-					foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
-					{
-						$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
-					}
-					$sOrderSQL .= ' ELSE 10000000 END';
-					$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-					$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-					$sSQL .= "(extratags->'place') as extra_place ";
-					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
-					if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-					$sSQL .= ") ";
-					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-					$sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
-					$sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
-					$sSQL .= ",extratags->'place' ";
-					$sSQL .= " union ";
-					$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.15 as importance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= " union ";
-					$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
-					$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
-					$sSQL .= "null as placename,";
-					$sSQL .= "null as ref,";
-					$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-//					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "-0.10 as importance, ";
-					$sSQL .= "null as extra_place ";
-					$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-					$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
-					$sSQL .= "group by place_id";
-					if (!$bDeDupe) $sSQL .= ",place_id";
-					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
-					$sSQL .= "order by importance desc";
-//					$sSQL .= "order by rank_search,rank_address,porder asc";
-					if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
-					$aSearchResults = $oDB->getAll($sSQL);
-//var_dump($sSQL,$aSearchResults);exit;
-
-					if (PEAR::IsError($aSearchResults))
-					{
-                        failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
-					}
+				// Get the details for display (is this a redundant extra step?)
+				$sPlaceIDs = join(',',$aResultPlaceIDs);
+				$sOrderSQL = 'CASE ';
+				foreach(array_keys($aResultPlaceIDs) as $iOrder => $iPlaceID)
+				{
+					$sOrderSQL .= 'when min(place_id) = '.$iPlaceID.' then '.$iOrder.' ';
+				}
+				$sOrderSQL .= ' ELSE 10000000 END';
+				$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+				$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
+				$sSQL .= "(extratags->'place') as extra_place ";
+				$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and (placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+				if (14 >= $iMinAddressRank && 14 <= $iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
+				$sSQL .= ") ";
+				$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+				$sSQL .= ",get_name_by_language(name, $sLanguagePrefArraySQL) ";
+				$sSQL .= ",get_name_by_language(name, ARRAY['ref']) ";
+				$sSQL .= ",extratags->'place' ";
+				$sSQL .= " union ";
+				$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "null as placename,";
+				$sSQL .= "null as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "-0.15 as importance, ";
+				$sSQL .= "null as extra_place ";
+				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "group by place_id";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= " union ";
+				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= "null as placename,";
+				$sSQL .= "null as ref,";
+				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
+				//$sSQL .= $sOrderSQL." as porder, ";
+				$sSQL .= "-0.10 as importance, ";
+				$sSQL .= "null as extra_place ";
+				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
+				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
+				$sSQL .= "group by place_id";
+				if (!$bDeDupe) $sSQL .= ",place_id";
+				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+				$sSQL .= "order by importance desc";
+				//$sSQL .= "order by rank_search,rank_address,porder asc";
+				if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
+				$aSearchResults = $oDB->getAll($sSQL);
+				//var_dump($sSQL,$aSearchResults);exit;
+
+				if (PEAR::IsError($aSearchResults))
+				{
+					failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
 				}
 			}
 		}
-	
+	}
+
 	$sSearchResult = '';
 	if (!sizeof($aSearchResults) && isset($_GET['q']) && $_GET['q'])
 	{
 		$sSearchResult = 'No Results Found';
 	}
-//var_Dump($aSearchResults);
-//exit;
+	//var_Dump($aSearchResults);
+	//exit;
 	$aClassType = getClassTypesWithImportance();
 	$aRecheckWords = preg_split('/\b/u',$sQuery);
 	foreach($aRecheckWords as $i => $sWord)
@@ -1380,11 +1381,12 @@
 				if ($bAsSVG) $aResult['assvg'] = $aPointPolygon['assvg'];
 				if ($bAsText) $aResult['astext'] = $aPointPolygon['astext'];
 
-				if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null ) {
+				if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null )
+				{
 					$aResult['lat'] = $aPointPolygon['centrelat'];
 					$aResult['lon'] = $aPointPolygon['centrelon'];
 				}
-				if ($bShowPolygons) 
+				if ($bShowPolygons)
 				{
 					// Translate geometary string to point array
 					if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
@@ -1437,12 +1439,12 @@
 			// Default
 			$fDiameter = 0.0001;
 
-			if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) 
+			if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
 					&& $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
 			{
 				$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defzoom'];
 			}
-			elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) 
+			elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
 					&& $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
 			{
 				$fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
@@ -1474,14 +1476,14 @@
 		}
 
 		// Is there an icon set for this type of result?
-		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon']) 
-			&& $aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
+		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
+				&& $aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
 		{
 			$aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
 		}
 
-		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label']) 
-			&& $aClassType[$aResult['class'].':'.$aResult['type']]['label'])
+		if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
+				&& $aClassType[$aResult['class'].':'.$aResult['type']]['label'])
 		{
 			$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
 		}
@@ -1494,8 +1496,8 @@
 				$aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']);
 			}
 
-//var_dump($aResult['address']);
-//exit;
+			//var_dump($aResult['address']);
+			//exit;
 		}
 
 		// Adjust importance for the number of exact string matches in the result
@@ -1509,23 +1511,23 @@
 
 		$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
 
-//if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']);
-/*
-		if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance']) 
-			&& $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
-		{
-			$aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'];
-		}
-		elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance']) 
-			&& $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-		{
-			$aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
-		}
-		else
-		{
-			$aResult['importance'] = 1000000000000000;
-		}
-*/
+		//if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']);
+		/*
+		   if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
+		   && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'])
+		   {
+		   $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['importance'];
+		   }
+		   elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
+		   && $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
+		   {
+		   $aResult['importance'] = $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
+		   }
+		   else
+		   {
+		   $aResult['importance'] = 1000000000000000;
+		   }
+		 */
 		$aResult['name'] = $aResult['langaddress'];
 		$aResult['foundorder'] = -$aResult['addressimportance'];
 		$aSearchResults[$iResNum] = $aResult;
@@ -1550,7 +1552,7 @@
 			$bFirst = false;
 		}
 		if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
-			&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']])))
+					&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']])))
 		{
 			$aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
 			$aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true;
@@ -1572,7 +1574,7 @@
 	{
 		logEnd($oDB, $hLog, sizeof($aToFilter));
 	}
- 	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
+	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
 	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
 	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
diff --git a/website/status.php b/website/status.php
index a7a197b8..c9d872d0 100644
--- a/website/status.php
+++ b/website/status.php
@@ -1,9 +1,9 @@
 <?php
-        @define('CONST_ConnectionBucket_PageType', 'Status');
+	@define('CONST_ConnectionBucket_PageType', 'Status');
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 
-        $oDB =& getDB();
+	$oDB =& getDB();
 	if (!$oDB || PEAR::isError($oDB))
 	{
 		echo "ERROR: No database";
-- 
2.39.5