first commit
minor changes
no hardcode query
fixed country