diff --git a/cli/commands/info.go b/cli/commands/info.go
index 37df2a8..4293f5f 100644
--- a/cli/commands/info.go
+++ b/cli/commands/info.go
@@ -75,4 +75,14 @@ func (m *mapInfo) display(id string) {
 			fmt.Print("\n")
 		}
 	}
+	fmt.Print("Tags:")
+	if len(meta.Tags) < 1 {
+		fmt.Print("\n")
+	}
+	for i, t := range meta.Tags {
+		fmt.Printf(" %s", t)
+		if i == (len(meta.Tags) - 1) {
+			fmt.Print("\n")
+		}
+	}
 }
diff --git a/maps/registry.go b/maps/registry.go
index 7fe0b01..a8ec658 100644
--- a/maps/registry.go
+++ b/maps/registry.go
@@ -25,7 +25,7 @@ func (registry MapRegistry) RegisterMap(id string, m GameMap) {
 // List returns all registered map IDs in alphabetical order
 func (registry MapRegistry) List() []string {
 	var keys []string
-	for k, _ := range registry {
+	for k := range registry {
 		keys = append(keys, k)
 	}
 	sort.Strings(keys)