diff --git a/model_hafas_messages.go b/model_hafas_messages.go
index bdb3a05519a159cbbefd45483ebce1cdcbbec364..d3be960ed91baf52415acbac834b771f43f21eef 100644
--- a/model_hafas_messages.go
+++ b/model_hafas_messages.go
@@ -12,7 +12,7 @@ type HafasMessage struct {
 type HafasMessagePriority string
 
 const (
-	HafasMessagePriorityLow    HafasMessagePriority = "LOW"
-	HafasMessagePriorityMiddle HafasMessagePriority = "MIDDLE"
 	HafasMessagePriorityHigh   HafasMessagePriority = "HIGH"
+	HafasMessagePriorityMiddle HafasMessagePriority = "MEDIUM"
+	HafasMessagePriorityLow    HafasMessagePriority = "LOW"
 )
diff --git a/model_station.go b/model_station.go
index 7fcf5d92825447407f9363a2f5ba9f40ca4c1f19..60e470d9b8502a4b268e7006cdfedcbccb361c86 100644
--- a/model_station.go
+++ b/model_station.go
@@ -8,6 +8,6 @@ type Station struct {
 	StationName string     `json:"station_name,omitempty"yaml:"station_name,omitempty"`
 	EvaId       string     `json:"eva_id,omitempty"yaml:"eva_id,omitempty"`
 	StationCode string     `json:"station_code,omitempty"yaml:"station_code,omitempty"`
-	Db          bool       `json:"db"yaml:"db"`
+	Db          bool       `json:"db,omitempty"yaml:"db,omitempty"`
 	CreatedAt   *time.Time `json:"created_at,omitempty"yaml:"created_at,omitempty"`
 }
diff --git a/model_suggestion.go b/model_suggestion.go
index 26a5dfb6c2c64299ec141ffbaf1e39f5385a7459..ef9d2739488e9fd37194e3e25eef26b4965ebe8f 100644
--- a/model_suggestion.go
+++ b/model_suggestion.go
@@ -3,14 +3,14 @@ package bahn
 import "time"
 
 type Suggestion struct {
-	Value            string
-	Cycle            string
-	Pool             string
-	Id               string
-	TrainLink        string
-	PublishedTime    *time.Time
-	DepartureStation string
-	DepartureTime    *time.Time
-	ArrivalStation   string
-	ArrivalTime      *time.Time
+	Value            string     `json:"value,omitempty"yaml:"value,omitempty"`
+	Cycle            string     `json:"cycle,omitempty"yaml:"cycle,omitempty"`
+	Pool             string     `json:"pool,omitempty"yaml:"pool,omitempty"`
+	Id               string     `json:"id,omitempty"yaml:"id,omitempty"`
+	TrainLink        string     `json:"train_link,omitempty"yaml:"train_link,omitempty"`
+	PublishedTime    *time.Time `json:"published_time,omitempty"yaml:"published_time,omitempty"`
+	DepartureStation string     `json:"departure_station,omitempty"yaml:"departure_station,omitempty"`
+	DepartureTime    *time.Time `json:"departure_time,omitempty"yaml:"departure_time,omitempty"`
+	ArrivalStation   string     `json:"arrival_station,omitempty"yaml:"arrival_station,omitempty"`
+	ArrivalTime      *time.Time `json:"arrival_time,omitempty"yaml:"arrival_time,omitempty"`
 }
diff --git a/model_wings.go b/model_wings.go
index d9715026de21ae4eb3f5638880679be2dd1eeabf..0350d910ce1ae8d59642a10c85873eb8e6a9c6fa 100644
--- a/model_wings.go
+++ b/model_wings.go
@@ -9,5 +9,5 @@ type WingDefinitionElement struct {
 	EvaId       string `json:"eva_id,omitempty"yaml:"eva_id,omitempty"`
 	StationName string `json:"station_name,omitempty"yaml:"station_name,omitempty"`
 	PlannedTime string `json:"planned_time,omitempty"yaml:"planned_time,omitempty"`
-	Fl          bool   `json:"fl"yaml:"fl"`
+	Fl          bool   `json:"fl,omitempty"yaml:"fl,omitempty"`
 }