diff --git a/xq/site/components/entries.xqm b/xq/site/components/entries.xqm
index 6eb35cf..548a8b1 100644
--- a/xq/site/components/entries.xqm
+++ b/xq/site/components/entries.xqm
@@ -16,7 +16,8 @@ declare %rest:path("{$lang}/entries/{$id}")
         %output:html-version('5')
         function entries:entry($lang as xs:string, $id as xs:string, $query as xs:string?) {
           if (count($query) = 0) then
-            doc(`abaevdict_{$lang}/html/{$id}.html`)
+            (: doc(`abaevdict_{$lang}/html/{$id}.html`) :)
+            abv-m:make-html(doc(`abaevdict_{$lang}/xml/{$id}.xml`),$lang)
           else
             let $xml := doc(`abaevdict_{$lang}/xml/{$id}.xml`)/tei:entry[1]
             let $marked := ft:mark(
diff --git a/xq/test.xq b/xq/test.xq
index 5c42caa..b693648 100644
--- a/xq/test.xq
+++ b/xq/test.xq
@@ -3,10 +3,7 @@ declare namespace abv = "http://ossetic-studies.org/ns/abaevdict";
 
 import module namespace abv-m = 'http://ossetic-studies.org/ns/abaevdict-mod' at './abv-mod.xqm';
 
-let $mapdata := abv-m:make-geomap(
-            doc(`abaevdict_en/xml/entry_mad.xml`), 
-            'en')
-return json:serialize($mapdata)
+abv-m:make-html(doc('abaevdict_en/xml/entry_a.xml'),'en')
 
 (: collection(`abaevdict_en/html`)/article[@id='entry_az'] :)
 (: html:doc('abaevdict_en/html/entry_az.html') :)
diff --git a/xsl/abaev2html.xsl b/xsl/abaev2html.xsl
index dcdaa2e..7600140 100644
--- a/xsl/abaev2html.xsl
+++ b/xsl/abaev2html.xsl
@@ -87,12 +87,21 @@
                                               group-adjacent="not(self::tei:etym)">
                             <xsl:choose>
                               <xsl:when test="current-grouping-key()">
-                                <p class="abv-mainpart">
-                                  <xsl:apply-templates select="current-group()"/>
-                                </p>
+                                <div class="abv-mainpart">
+                                  <p>
+                                    <xsl:apply-templates select="current-group()"/>
+                                  </p>
+                                </div>
                               </xsl:when>
                               <xsl:otherwise>
-                                <xsl:apply-templates select="current-group()"/>
+                                <div class="abv-etym">
+                                  <xsl:for-each-group select="node()"
+                                                      group-starting-with="tei:lb">
+                                    <p>
+                                      <xsl:apply-templates select="current-group()"/>
+                                    </p>
+                                  </xsl:for-each-group>
+                                </div>
                               </xsl:otherwise>
                             </xsl:choose>
                           </xsl:for-each-group>
@@ -260,9 +269,7 @@
    
     <!--  ETYMOLOGY -->
     <xsl:template match="tei:etym">
-        <p class="abv-etym">
-            <xsl:apply-templates />
-        </p>
+      <xsl:apply-templates />
     </xsl:template>
     
     <xsl:template match="tei:oRef">
@@ -284,7 +291,6 @@
     </xsl:template>
     
     <xsl:template match="tei:lb">
-        <xsl:element name="br"/>
     </xsl:template>
 
     <xsl:template match="tei:hi">