Improve client db

this adds the functionality mentioned in #7 
I am not doing the lookup in case a client deliberately does not send us their country.