8 files changed, 22 insertions, 22 deletions
diff --git a/lib/contact/google/address.go b/lib/contact/google/address.go
index 563ae101..457a4aed 100644
--- a/lib/contact/google/address.go
+++ b/lib/contact/google/address.go
@@ -6,11 +6,11 @@ package google
 // Address format.
 type Address struct {
 	Rel         string `json:"rel,omitempty"`
-	Full        GD     `json:"gd$formattedAddress,omitempty"`
-	POBox       GD     `json:"gd$pobox,omitempty"`
-	Street      GD     `json:"gd$street,omitempty"`
-	City        GD     `json:"gd$city,omitempty"`
-	StateOrProv GD     `json:"gd$region,omitempty"`
-	PostalCode  GD     `json:"gd$postcode,omitempty"`
-	Country     GD     `json:"gd$country,omitempty"`
+	Full        GD     `json:"gd$formattedAddress"`
+	POBox       GD     `json:"gd$pobox"`
+	Street      GD     `json:"gd$street"`
+	City        GD     `json:"gd$city"`
+	StateOrProv GD     `json:"gd$region"`
+	PostalCode  GD     `json:"gd$postcode"`
+	Country     GD     `json:"gd$country"`
 }
diff --git a/lib/contact/google/author.go b/lib/contact/google/author.go
index 65ae94a6..b6a19c83 100644
--- a/lib/contact/google/author.go
+++ b/lib/contact/google/author.go
@@ -5,6 +5,6 @@ package google
 
 // Author define Google contacts author.
 type Author struct {
-	Name  GD `json:"name,omitempty"`
-	Email GD `json:"email,omitempty"`
+	Name  GD `json:"name"`
+	Email GD `json:"email"`
 }
diff --git a/lib/contact/google/contact.go b/lib/contact/google/contact.go
index 111643c9..5d27ed32 100644
--- a/lib/contact/google/contact.go
+++ b/lib/contact/google/contact.go
@@ -21,8 +21,8 @@ type Contact struct {
 	// Title      GD         `json:"title,omitempty"`
 	// Links      []Link     `json:"link,omitempty"`
 
-	Name      Name      `json:"gd$name,omitempty"`
-	Birthday  Birthday  `json:"gContact$birthday,omitempty"`
+	Name      Name      `json:"gd$name"`
+	Birthday  Birthday  `json:"gContact$birthday"`
 	Orgs      []Org     `json:"gd$organization,omitempty"`
 	Emails    []Email   `json:"gd$email,omitempty"`
 	Phones    []Phone   `json:"gd$phoneNumber,omitempty"`
diff --git a/lib/contact/google/event.go b/lib/contact/google/event.go
index a84cedc3..ce4bf51f 100644
--- a/lib/contact/google/event.go
+++ b/lib/contact/google/event.go
@@ -6,5 +6,5 @@ package google
 // Event format.
 type Event struct {
 	Rel  string    `json:"rel,omitempty"`
-	When EventTime `json:"gd$when,omitempty"`
+	When EventTime `json:"gd$when"`
 }
diff --git a/lib/contact/google/feed.go b/lib/contact/google/feed.go
index fbbc3584..aa3716a6 100644
--- a/lib/contact/google/feed.go
+++ b/lib/contact/google/feed.go
@@ -25,6 +25,6 @@ type Feed struct {
 	// StartIndex      GD         `json:"openSearch$startIndex,omitempty"`
 	// ItemsPerPage    GD         `json:"openSearch$itemsPerPage,omitempty"`
 
-	TotalResult GD        `json:"openSearch$totalResults,omitempty"`
+	TotalResult GD        `json:"openSearch$totalResults"`
 	Contacts    []Contact `json:"entry,omitempty"`
 }
diff --git a/lib/contact/google/name.go b/lib/contact/google/name.go
index cf78025b..1ab2fcd7 100644
--- a/lib/contact/google/name.go
+++ b/lib/contact/google/name.go
@@ -5,10 +5,10 @@ package google
 
 // Name define Google contact name format.
 type Name struct {
-	Prefix GD `json:"gd$namePrefix,omitempty"`
-	First  GD `json:"gd$givenName,omitempty"`
-	Middle GD `json:"gd$additionalName,omitempty"`
-	Last   GD `json:"gd$familyName,omitempty"`
-	Suffix GD `json:"gd$nameSuffix,omitempty"`
-	Full   GD `json:"gd$fullName,omitempty"`
+	Prefix GD `json:"gd$namePrefix"`
+	First  GD `json:"gd$givenName"`
+	Middle GD `json:"gd$additionalName"`
+	Last   GD `json:"gd$familyName"`
+	Suffix GD `json:"gd$nameSuffix"`
+	Full   GD `json:"gd$fullName"`
 }
diff --git a/lib/contact/google/org.go b/lib/contact/google/org.go
index c2cb8b1f..5cc9683e 100644
--- a/lib/contact/google/org.go
+++ b/lib/contact/google/org.go
@@ -6,6 +6,6 @@ package google
 // Org as organisation.
 type Org struct {
 	Type     string `json:"rel,omitempty"`
-	Name     GD     `json:"gd$orgName,omitempty"`
-	JobTitle GD     `json:"gd$orgTitle,omitempty"`
+	Name     GD     `json:"gd$orgName"`
+	JobTitle GD     `json:"gd$orgTitle"`
 }
diff --git a/lib/contact/google/root.go b/lib/contact/google/root.go
index e5cbff53..922f945e 100644
--- a/lib/contact/google/root.go
+++ b/lib/contact/google/root.go
@@ -7,5 +7,5 @@ package google
 type Root struct {
 	Version  string `json:"version,omitempty"`
 	Encoding string `json:"encoding,omitempty"`
-	Feed     Feed   `json:"feed,omitempty"`
+	Feed     Feed   `json:"feed"`
 }