diff --git a/source/clog-element-common.lisp b/source/clog-element-common.lisp
index 193c35c..802d28d 100644
--- a/source/clog-element-common.lisp
+++ b/source/clog-element-common.lisp
@@ -971,13 +971,13 @@ and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ"))
 ;; create-term ;;
 ;;;;;;;;;;;;;;;;;
 
-(defgeneric create-term (clog-definition-list
+(defgeneric create-term (clog-obj
 			 &key content
 			   hidden class html-id auto-place)
   (:documentation "Create a new CLOG-Term as child of CLOG-OBJ
 and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ"))
 
-(defmethod create-term ((obj clog-definition-list)
+(defmethod create-term ((obj clog-obj)
 			&key (hidden nil)
 			  (content "")
 			  (class nil)
@@ -1006,12 +1006,12 @@ and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ"))
 ;; create-description ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defgeneric create-description (clog-definition-list
+(defgeneric create-description (clog-obj
 				&key hidden content class html-id auto-place)
   (:documentation "Create a new CLOG-Description as child of CLOG-OBJ
 and if :AUTO-PLACE (default t) place-inside-bottom-of CLOG-OBJ"))
 
-(defmethod create-description ((obj clog-definition-list)
+(defmethod create-description ((obj clog-obj)
 			       &key (content "")
 				 (hidden nil)
 				 (class nil)
diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp
index 36a98a2..a1173ff 100644
--- a/tools/clog-builder-settings.lisp
+++ b/tools/clog-builder-settings.lisp
@@ -884,8 +884,8 @@
      :description    "Definition Term"
      :clog-type      clog:clog-term
      :create         clog:create-term
-     :create-type    :element
      :create-content "Term"
+     :create-type    :element
      :properties     (,@*props-element*))
    `(:name           "dd"
      :description    "Definition Description"
diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index c1e0b86..b46553b 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -284,16 +284,15 @@ not a temporary attached one when using select-control."
 					 (getf l :tag) (getf l :control)))
 			       *import-types*))))
       (clog::js-execute parent tmp))
-    (let* ((data (first-child parent))
+    (let* ((data (first-child content))
 	   (name    (attribute data "data-clog-title"))
 	   (next-id (attribute data "data-clog-next-id")))
-      (when next-id
-	(unless (equalp name "undefined")
-	  (setf-next-id next-id)))
       (when name
+	(unless (equalp next-id "undefined")
+	  (setf-next-id content next-id)))
 	(unless (equalp name "undefined")
-	  (setf (attribute parent "data-clog-name") name)
-	  (destroy data))))
+	  (setf (attribute content "data-clog-name") name)
+	  (destroy data)))
     (labels ((add-siblings (control)
 	       (let (dct)
 		 (loop
@@ -753,6 +752,8 @@ of controls and double click to select control."
 							     (create-child content "<data />"
 									   :html-id (format nil "I~A" panel-uid))))
 						       (place-inside-top-of content data)
+						       (setf (attribute data "data-clog-next-id")
+							     (attribute content "data-clog-next-id"))
 						       (setf (attribute data "data-clog-title")
 							     (attribute content "data-clog-name"))
 						       (write-file (inner-html content) fname)
@@ -839,6 +840,7 @@ of controls and double click to select control."
     (remhash (format nil "~A-win" panel-uid) *app-sync-hash*)
 
     ;; setup window and page
+    (setf-next-id content 1)
     (setf (attribute content "data-clog-name") panel-name)
     (setf (title (html-document body)) panel-name)
     (setf (window-title win) panel-name)
@@ -939,6 +941,8 @@ of controls and double click to select control."
 							       (create-child content "<data />"
 									     :html-id (format nil "I~A" panel-uid))))
 							 (place-inside-top-of content data)
+							 (setf (attribute data "data-clog-next-id")
+							     (attribute content "data-clog-next-id"))
 							 (setf (attribute data "data-clog-title")
 							       (attribute content "data-clog-name"))
 							 (write-file (inner-html content) fname)