diff --git a/neo/assistant/assistant.go b/neo/assistant/assistant.go
index 1a85867a..9f2f92ad 100644
--- a/neo/assistant/assistant.go
+++ b/neo/assistant/assistant.go
@@ -61,6 +61,10 @@ func LoadBuiltIn() error {
 		assistant.Readonly = true
 		assistant.BuiltIn = true
 		assistant.Sort = sort
+		if assistant.Tags == nil {
+			assistant.Tags = []string{"Built-in"}
+		}
+
 		sort++
 		loaded.Put(assistant)
 
@@ -238,6 +242,21 @@ func loadMap(data map[string]interface{}) (*Assistant, error) {
 		assistant.Connector = connector
 	}
 
+	// tags
+	if v, ok := data["tags"].([]string); ok {
+		assistant.Tags = v
+	}
+
+	// options
+	if v, ok := data["options"].(map[string]interface{}); ok {
+		assistant.Options = v
+	}
+
+	// description
+	if v, ok := data["description"].(string); ok {
+		assistant.Description = v
+	}
+
 	// prompts
 	if v, ok := data["prompts"].(string); ok {
 		var prompts []Prompt