diff --git a/hack/goget/main.go b/hack/goget/main.go
index 4d47d9f..962731a 100644
--- a/hack/goget/main.go
+++ b/hack/goget/main.go
@@ -41,6 +41,8 @@ type index struct {
 	group   string
 }
 
+var arg = ""
+
 func getSpec(level int, specName string) spec {
 	spec := spec{}
 
@@ -225,6 +227,7 @@ func main() {
 			log.Fatal("error: ", err)
 		}
 	} else {
+		arg = os.Args[1]
 		spec := getSpec(1, os.Args[1])
 		specs[spec.uuid] = spec
 	}
@@ -350,7 +353,11 @@ func printFields(level int, fields []field, baseUuidLength int, baseName string,
 		if len(fields[i].uuid) > baseUuidLength && len(fields[i].uuid[baseUuidLength+1:]) > 0 {
 			fmt.Println(fill + "  " + baseName + "." + fields[i].uuid[baseUuidLength+1:])
 		} else if len(fields[i].uuid) == baseUuidLength {
-			fmt.Println(fill + "  " + baseName)
+			if recurse {
+				fmt.Println(fill + "  " + baseName)
+			} else {
+				fmt.Println(fill + "  " + baseName + fields[i].uuid[len(arg):])
+			}
 		}
 		for j := range fields[i].description {
 			fmt.Println(fill + "    " + fields[i].description[j])