fix cities and countries location not null where

[ci-work]

locations.location is a not null field, gateway_inventory.location is a nullable field, so query makes more sense (and is faster) when where is g.location is not null