dont set type till its a valid type
going from ?id=123&type=geoname to ?id=geoname/123
tests updated