diff --git a/templates/explore/dataset_list.tmpl b/templates/explore/dataset_list.tmpl
index 48ae78127..7abc03363 100755
--- a/templates/explore/dataset_list.tmpl
+++ b/templates/explore/dataset_list.tmpl
@@ -29,8 +29,12 @@
             {{.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>
-            <span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
+            {{if .Task}}
+              <span class="text grey">{{svg "octicon-tasklist" 16}} {{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
+            {{end}}
+            {{if .Category}}
+              <span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
+            {{end}}
             <span class="text grey">{{svg "octicon-flame" 16}} {{.DownloadTimes}}</span>
           </div>
         </div>