diff --git a/templates/explore/dataset_list.tmpl b/templates/explore/dataset_list.tmpl
index 5f4720fec..f7caf4f36 100755
--- a/templates/explore/dataset_list.tmpl
+++ b/templates/explore/dataset_list.tmpl
@@ -26,7 +26,7 @@
       <div class="item">
         <div class="ui header">
           <a class="name" href="{{.Repo.Link}}/datasets">
-            {{.Title}}
+            {{.Repo.OwnerName}} / {{.Title}}
           </a>
           <div class="ui right metas">
             <span class="text grey">{{svg "octicon-tasklist" 16}} {{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
@@ -37,7 +37,11 @@
           </div>
         </div>
         <div class="description">
-          <a><div class="ui small label topic">{{.Description}}</div></a>
+          {{if .Description}}
+            <p class="has-emoji">{{.Description}}</p>
+          {{else if .Repo.DescriptionHTML}}
+            <p class="has-emoji">{{.Repo.DescriptionHTML}}</p>
+          {{end}}
           <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}</p>
         </div>
       </div>
diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index 09642b222..1c6a2a2b2 100755
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -21,7 +21,11 @@
       </div>
       <div class="row">
         <div class="column sixteen wide">
-          <span class="no-description text-italic">{{.dataset.Description}}</span>
+          {{if .dataset.Description }}
+            <span class="no-description text-italic">{{.dataset.Description}}</span>
+          {{else}}
+            <span class="no-description text-italic">{{.Repository.DescriptionHTML}}</span>
+          {{end}}
         </div>
       </div>
     </div>