add label for country (re #392)
fix template error in country (re #392)