             
             var customFieldObject = object.customFieldWithBasename(field.basename)
             if customFieldObject == nil {
-                customFieldObject = CustomField(json:["":""])
+                customFieldObject = field
             }
             
             var entryItem: BaseEntryItem = BaseEntryItem()
             if field.type == "text" {
                 var item = EntryTextItem()
                 item.text = customFieldObject!.value
+                if customFieldObject!.value.isEmpty {
+                    item.text = customFieldObject!.defaultValue
+                }
                 entryItem = item
             } else if field.type == "textarea" {
                 var item = EntryTextAreaItem()

            } else if field.type == "embed" {
                var item = EntryEmbedItem()
                item.text = customFieldObject!.value
                entryItem = item
            } else if field.type == "image" {
                var item = EntryImageItem()

                    item = EntryBlocksItem()
                }
                item.text = customFieldObject!.value
                if customFieldObject!.value.isEmpty {
                    item.text = customFieldObject!.defaultValue
                }
                entryItem = item
            } else if field.type == "checkbox" {
                var item = EntryCheckboxItem()
                item.checked = (customFieldObject!.value == "true")
                if customFieldObject!.value.isEmpty {
                    item.checked = (customFieldObject!.defaultValue == "true")
                }
                entryItem = item
            } else if field.type == "url" {
                var item = EntryURLItem()
                item.url = customFieldObject!.value
                if customFieldObject!.value.isEmpty {
                    item.url = customFieldObject!.defaultValue
                }
                entryItem = item
            } else if field.type == "datetime" {
                if field.options == "datetime" {
