updated country info and fix in db_query