Check for zip and country address_class

- Remove duplicate user_city address_class check
- Add user_zip address_class check
- Add country address_class check

Fixes #135