diff --git a/GSWeb.framework/GSWHTMLStaticElement.m b/GSWeb.framework/GSWHTMLStaticElement.m
index d305d09..25918c7 100644
--- a/GSWeb.framework/GSWHTMLStaticElement.m
+++ b/GSWeb.framework/GSWHTMLStaticElement.m
@@ -93,15 +93,14 @@ static char rcsId[] = "$Id$";
 		  for(;elementsN>0;elementsN--)
 			[_elementsMap appendBytes:&ElementsMap_dynamicElement
 						   length:1];
+                  if (_elementName)
+                    {
+                      [_htmlBareStrings addObject:[NSString stringWithFormat:@"</%@>",
+                                                            _elementName]];
+                      [_elementsMap appendBytes:&ElementsMap_htmlBareString
+                                    length:1];
+                    };
                 };
-          //VERIFY Only if _elements ?
-          if (_elementName)
-            {
-              [_htmlBareStrings addObject:[NSString stringWithFormat:@"</%@>",
-                                                    _elementName]];
-              [_elementsMap appendBytes:&ElementsMap_htmlBareString
-                            length:1];
-            };
 		
 	  [self _initWithElementsMap:_elementsMap
 			htmlBareStrings:_htmlBareStrings
@@ -147,15 +146,14 @@ static char rcsId[] = "$Id$";
 		  for(;elementsN>0;elementsN--)
 			[_elementsMap appendBytes:&ElementsMap_dynamicElement
 						   length:1];
+                  if (_elementName)
+                    {
+                      [_htmlBareStrings addObject:[NSString stringWithFormat:@"</%@>",
+                                                            _elementName]];
+                      [_elementsMap appendBytes:&ElementsMap_htmlBareString
+                                    length:1];
+                    };
                 };
-          //VERIFY Only if _elements ?
-          if (_elementName)
-            {
-              [_htmlBareStrings addObject:[NSString stringWithFormat:@"</%@>",
-                                                    _elementName]];
-              [_elementsMap appendBytes:&ElementsMap_htmlBareString
-                            length:1];
-            };
 	  [self _initWithElementsMap:_elementsMap
 			htmlBareStrings:_htmlBareStrings
 			dynamicChildren:_elements];	  
diff --git a/GSWeb.framework/GSWTemplateParserXML.m b/GSWeb.framework/GSWTemplateParserXML.m
index ce92216..47aed93 100644
--- a/GSWeb.framework/GSWTemplateParserXML.m
+++ b/GSWeb.framework/GSWTemplateParserXML.m
@@ -854,6 +854,18 @@ text [Type:XML_TEXT_NODE] [{}] ####
                         {
                           _associations=[NSDictionary dictionaryWithDictionary:_addedAssoc];
                         };
+                      //To know if it's an autoclose tag
+                      if (!children && [self isKindOfClass:[GSWTemplateParserXMLHTML class]])
+                        {
+                          htmlElemDescPtr elemDscr=NULL;                          
+                          elemDscr=htmlTagLookup([nodeName lossyCString]);
+                          if (elemDscr
+                              && elemDscr->endTag!=2 //Forbidden End Tag
+                              && elemDscr->endTag!=1) //End can be omitted
+                            {
+                              children=[NSArray array];
+                            };
+                        };
                       NSDebugMLog(@"node=%p StaticElement: children=%@",currentNode,children);
                       elem=[[[GSWHTMLStaticElement alloc]initWithName:nodeName
                                                          attributeDictionary:_associations