First part of web service changes for supporting multiple countries.
fix #11