diff --git a/models/channel.go b/models/channel.go
index 9f1ad17..d65e23f 100644
--- a/models/channel.go
+++ b/models/channel.go
@@ -5,6 +5,6 @@ type Channel struct {
 	Name         string `bson:"_id"`
 	Logged       bool   `bson:"logged"`
 	Hub          bool   `bson:"hub"`
-	EventName    string `bson:"event,omitempty"`
-	LocationName string `bson:"location,omitempty"`
+	EventName    string `bson:"eventName,omitempty"`
+	LocationName string `bson:"locationName,omitempty"`
 }
diff --git a/models/channels/edit.go b/models/channels/edit.go
index da34318..3cdf5cc 100644
--- a/models/channels/edit.go
+++ b/models/channels/edit.go
@@ -11,15 +11,19 @@ func Edit(channel models.Channel, logged, hub *bool, eventName, locationName *st
 
 	if logged != nil && *logged != channel.Logged {
 		mutation["logged"] = *logged
+		channel.Logged = *logged
 	}
 	if hub != nil && *hub != channel.Hub {
 		mutation["hub"] = *hub
+		channel.Hub = *hub
 	}
 	if eventName != nil && *eventName != channel.EventName {
 		mutation["eventName"] = *eventName
+		channel.EventName = *eventName
 	}
 	if locationName != nil && *locationName != channel.LocationName {
 		mutation["locationName"] = *locationName
+		channel.LocationName = *locationName
 	}
 
 	if len(mutation) == 0 {
diff --git a/models/channels/list.go b/models/channels/list.go
index 75345f8..7a9500c 100644
--- a/models/channels/list.go
+++ b/models/channels/list.go
@@ -30,7 +30,7 @@ func List(filter *Filter) ([]models.Channel, error) {
 	}
 
 	channels := make([]models.Channel, 0, 128)
-	err := collection.Find(query).All(&channels)
+	err := collection.Find(query).Sort("_id").All(&channels)
 
 	return channels, err
 }