diff --git a/core/config/config.go b/core/config/config.go
index 468e652..47d4f4c 100644
--- a/core/config/config.go
+++ b/core/config/config.go
@@ -93,8 +93,8 @@ type HTTPServerConfig struct {
 // ZabbixConfig contains information about Zabbix connection.
 type ZabbixConfig struct {
 	ServerHost string `yaml:"server_host"`
-	ServerPort int    `yaml:"server_port"`
 	Host       string `yaml:"host"`
+	ServerPort int    `yaml:"server_port"`
 	Interval   uint64 `yaml:"interval"`
 }
 
diff --git a/core/db/models/connection.go b/core/db/models/connection.go
index de66f4a..8bb55d3 100644
--- a/core/db/models/connection.go
+++ b/core/db/models/connection.go
@@ -11,9 +11,9 @@ type Connection struct {
 	GateURL   string    `gorm:"column:mg_url; type:varchar(255); not null;" json:"mgUrl,omitempty" binding:"max=255"`
 	GateToken string    `gorm:"column:mg_token; type:varchar(100); not null; unique" json:"mgToken,omitempty" binding:"max=100"` // nolint:lll
 	ClientID  string    `gorm:"column:client_id; type:varchar(70); not null; unique" json:"clientId,omitempty"`
+	Lang      string    `gorm:"column:lang; type:varchar(2)" json:"lang,omitempty" binding:"max=2"`
+	PublicURL string    `gorm:"column:public_url; type:varchar(255);" json:"publicUrl,omitempty" binding:"max=255"`
 	Accounts  []Account `gorm:"foreignkey:ConnectionID" json:"accounts"`
 	ID        int       `gorm:"primary_key" json:"id"`
 	Active    bool      `json:"active,omitempty"`
-	Lang      string    `gorm:"column:lang; type:varchar(2)" json:"lang,omitempty" binding:"max=2"`
-	PublicURL string    `gorm:"column:public_url; type:varchar(255);" json:"publicUrl,omitempty" binding:"max=255"`
 }