             <cfquery name="componentMatch" datasource="user_login" username="#session.dbuser#" password="#decrypt(session.epw,session.sessionKey)#">
                 select HIGHER_GEOG from geog_auth_rec where
                    upper(trim(Country)) = '#ucase(thisCountry)#' and
-									stripGeogRanks(state_prov)=stripGeogRanks('#thisState#') and
-<!----
-                   upper(trim(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(state_prov,'Prov.'),'Community'),'Island'),'kray'),'Ward'),'Territory'),'autonomous oblast'),'okrug'),'Republic of'),'Oblast'),'Parish'),'Municipality'),'Pref.'),'City'),'Depto.')))
-				 = '#ucase(thisState)#' and
-				                 upper(trim(replace(replace(replace(replace(replace(replace(county,'Borough'), 'County'), 'Province'),'Parish'),'District'), 'Territory'))) = '#ucase(thisCounty)#'
-
-				 ---->
+				stripGeogRanks(state_prov)=stripGeogRanks('#thisState#') and
 				stripGeogRanks(county)=stripGeogRanks('#thisCounty#')
+				<!--- just block this if we have drainage data; it's useful-ish in all other cases--->
+				<cfif len(thisDrainage) gt 0>
+					and 1=2
+				</cfif>
             </cfquery>
 
 			<cfif debug is "yes">

		<input type="submit" value="Upload this file" class="savBtn">
	</form>
	<hr>Option Two: Load "higher geography" strings
	<ul>
		<li>old_geog</li>
	</ul>

					<!----
					upper(trim(replace(replace(replace(replace(replace(replace(county,'Borough'), 'County'), 'Province'),'Parish'),'District'), 'Territory'))) = '#ucase(thisCounty)#'
					---->
					stripGeogRanks(county)=stripGeogRanks('#thisCounty#') and

				<cfelse>
					county is null and
				</cfif>
				<cfif len(thisDrainage) gt 0>
					stripGeogRanks(drainage)=stripGeogRanks('#thisDrainage#')
				<cfelse>
					drainage is null
				</cfif>
				<cfif gotsomething is false>
				    and 1=2
