diff --git a/pygeoapi/templates/base.html b/pygeoapi/templates/base.html
index 67c4b09..59248e0 100644
--- a/pygeoapi/templates/base.html
+++ b/pygeoapi/templates/base.html
@@ -20,11 +20,10 @@
   </head>
   <body>
     <header class="sticky row" itemscope itemtype="http://schema.org/DataCatalog" itemref="collections">
-      <meta itemprop="url" content="{{ config['server']['url'] }}" />
       <meta itemprop="description" content="{{ config['metadata']['identification']['description'] | striptags }}" />
       <div class="col-sm-12 col-md-10 col-md-offset-1">
-        <a role="button" itemprop="name" href="{{ config['server']['url'] }}/?f=html">
-          {{ config['metadata']['identification']['title'] }}</a>
+        <a role="button" itemprop="url" href="{{ config['server']['url'] }}">
+          <span itemprop="name">{{ config['metadata']['identification']['title'] }}</span></a>
         <a href="mailto:{{ config['metadata']['contact']['email'] }}" role="button" style="float:right">Contact</a>
       </div>
     </header>
diff --git a/pygeoapi/templates/collection.html b/pygeoapi/templates/collection.html
index 1fe1ae6..7f34592 100644
--- a/pygeoapi/templates/collection.html
+++ b/pygeoapi/templates/collection.html
@@ -6,7 +6,11 @@
 {% endblock %}
 {% block body %}
     <section id="collections" itemprop="dataset" itemscope itemtype="http://schema.org/Dataset">
-      <meta itemprop="includedInDataCatalog" content="{{ config['server']['url'] }}" />
+      <span itemprop="includedInDataCatalog" itemscope itemtype="http://schema.org/DataCatalog">
+        <meta itemprop="url" content="{{ config['server']['url'] }}" />
+        <meta itemprop="name" content="{{ config['metadata']['identification']['title'] | striptags }}" />
+        <meta itemprop="name" content="{{ config['metadata']['identification']['description'] | striptags }}" />
+      </span>
       <h2 itemprop="name">{{ data['title'] }}</h2>
       <div itemprop="description">{{ data['description'] }}</div>
       <h3>View</h3>
diff --git a/pygeoapi/templates/collections.html b/pygeoapi/templates/collections.html
index 34704b3..766f989 100644
--- a/pygeoapi/templates/collections.html
+++ b/pygeoapi/templates/collections.html
@@ -16,9 +16,10 @@
               <tbody>
                 {% for k, v in config['datasets'].items() %}
                 <tr itemprop="dataset" itemscope itemtype="http://schema.org/Dataset">
-                  <td itemprop="name" data-label="name">
-                    <meta itemprop="url" content="{{ config['server']['url'] }}/collections/{{ k }}" />
-                    <a title="{{ v['title'] | striptags | truncate }}" href="{{ config['server']['url'] }}/collections/{{ k }}">{{ v['title'] | striptags | truncate }}</a>
+                  <td data-label="name">
+                    <a  itemprop="url" title="{{ v['title'] | striptags | truncate }}" 
+                      href="{{ config['server']['url'] }}/collections/{{ k }}">
+                      <span itemprop="name">{{ v['title'] | striptags | truncate }}</span></a>
                   </td>
                   <td itemprop="description" data-label="description">
                     {{ v['description'] | striptags | truncate }}
