diff --git a/cli/completer.go b/cli/completer.go
index 650c84b..dee1461 100644
--- a/cli/completer.go
+++ b/cli/completer.go
@@ -129,6 +129,11 @@
 					name = resource["name"].(string)
 				} else if resource["username"] != nil {
 					name = resource["username"].(string)
+				} else if resource["hypervisor"] != nil && resource["hypervisorversion"] != nil {
+					name = fmt.Sprintf("%s %s", resource["hypervisor"].(string), resource["hypervisorversion"].(string))
+					if resource["osdisplayname"] != nil {
+						name = fmt.Sprintf("%s; %s", resource["osdisplayname"].(string), name)
+					}
 				}
 				if resource["displaytext"] != nil {
 					detail = resource["displaytext"].(string)