diff --git a/generators/vt-template/template.go b/generators/vt-template/template.go
index 3f58950..877cfcf 100644
--- a/generators/vt-template/template.go
+++ b/generators/vt-template/template.go
@@ -12,8 +12,7 @@ export default [{{range $model := .Entities}}
       breadcrumbs: ["dashboard", "{{.JSName}}List"]
     }
   },
-  {{if not .ReadOnly}}
-  {
+  {{if not .ReadOnly}}{
     name: "{{.JSName}}Edit",
     path: "/{{.TerminalPath}}/:id/edit",
     component: () =>
@@ -73,8 +72,7 @@ const listTemplate = `<template>
                       : ""
                   }}
                 </v-btn>
-				[[if not .ReadOnly]]
-                <v-btn small dark color="success" :to="{ name: '[[.JSName]]Add' }">
+				[[if not .ReadOnly]]<v-btn small dark color="success" :to="{ name: '[[.JSName]]Add' }">
                   <v-icon>add</v-icon>
                   {{ $t("common.list.addNewLabel") }}
                 </v-btn>
@@ -232,26 +230,21 @@ export default class List extends EntityList {
 
   get headers() {
     return [ [[range $i, $e := .ListColumns]][[if ne $i 0]]
-      },		
-[[end]][[if eq .JSName "statusId"]]
-      {
+      },
+[[end]]{[[if eq .JSName "statusId"]]
         text: this.$t("[[$.JSName]].list.headers.status"),
         value: "status",
 		sortable: false
-      [[else]]
-      {
+[[else]]
         text: this.$t("[[$.JSName]].list.headers.[[.JSName]]"),
         value: "[[.JSName]]"[[if eq $i 0]],
         align: "left"[[end]][[if not .IsSortable]],
-		sortable: false[[end]][[end]][[end]][[if $.ReadOnly]]
-      }[[else]]
-	  },
+		sortable: false[[end]][[end]][[end]][[if $.ReadOnly]]}[[else]]},
       {
         text: this.$t("[[$.JSName]].list.headers.actions"),
         value: "id",
         sortable: false
-      }
-[[end]]
+      }[[end]]
     ];
   }
 }
diff --git a/generators/vt-template/vt_template.go b/generators/vt-template/vt_template.go
index 5a54663..6c349de 100644
--- a/generators/vt-template/vt_template.go
+++ b/generators/vt-template/vt_template.go
@@ -35,12 +35,16 @@ func PackEntity(vtEntity mfd.VTEntity) EntityData {
 			JSName: mfd.VarName(pk.Name),
 		})
 	}
+	quickFilter := ""
+	if title := vtEntity.Entity.TitleAttribute(); title != nil {
+		quickFilter = mfd.VarName(title.Name)
+	}
 
 	tmpl := EntityData{
 		Name:           vtEntity.Name,
 		JSName:         mfd.VarName(vtEntity.Name),
-		HasQuickFilter: false, // TODO remove
-		TitleField:     "",    // TODO remove
+		HasQuickFilter: quickFilter != "", // TODO remove
+		TitleField:     quickFilter,       // TODO remove
 		PKs:            pks,
 		ReadOnly:       vtEntity.Mode == mfd.ModeReadOnlyWithTemplates,
 	}
diff --git a/mfd/map.go b/mfd/map.go
index 49aa9b5..934a747 100644
--- a/mfd/map.go
+++ b/mfd/map.go
@@ -1,6 +1,7 @@
 package mfd
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"io"
 )
@@ -26,6 +27,14 @@ func NewXMLMap(init map[string]string) *XMLMap {
 	return xmlMap
 }
 
+func (m XMLMap) MarshalJSON() ([]byte, error) {
+	jsM := make(map[string]interface{})
+	for _, i := range m.elements {
+		jsM[i.XMLName.Local] = i.Value
+	}
+	return json.Marshal(jsM)
+}
+
 func (m *XMLMap) Append(key, value string) {
 	if m.elements == nil {
 		m.elements = []xmlMapElement{{