diff --git a/src/client/components/VirtualizedTable.js b/src/client/components/VirtualizedTable.js
index a65fdbb82961aed0ea88353e04e63b7db76d4109..6a237a613df5cdae122f151ea6742096f417a809 100644
--- a/src/client/components/VirtualizedTable.js
+++ b/src/client/components/VirtualizedTable.js
@@ -92,8 +92,13 @@ class VirtualizedTable extends React.PureComponent {
 
     const idRenderer = ({cellData, rowData}) => {
       if (cellData == null) return '';
-      const idLink = <a target='_blank' rel='noopener noreferrer' href={'https://sdbm.library.upenn.edu/manuscripts/' + cellData}>{cellData}</a>;
-
+      let sdbmUrl = '';
+      if (rowData.sdbmId) {
+        sdbmUrl = 'https://sdbm.library.upenn.edu/manuscripts/';
+      } else {
+        sdbmUrl = 'https://sdbm.library.upenn.edu/entries/';
+      }
+      const idLink = <a target='_blank' rel='noopener noreferrer' href={sdbmUrl + cellData}>{cellData}</a>;
       return (
         <div key={cellData}>
           {idLink}
@@ -102,7 +107,7 @@ class VirtualizedTable extends React.PureComponent {
     };
 
     const valueFromArray = (property, rowData) => {
-      if (rowData[property] === 'Undefined') {
+      if (rowData[property] === '-') {
         return rowData[property];
       } else {
         return rowData[property].map((item => item.split(';')[1])).join(' | ');
diff --git a/src/server/sparql/Mappers.js b/src/server/sparql/Mappers.js
index 3bd4f93c3d7424baeabe4a8c230a027ab782da4f..b58e77902cf19d87e5e8bab982eeb93eb44835fb 100644
--- a/src/server/sparql/Mappers.js
+++ b/src/server/sparql/Mappers.js
@@ -50,13 +50,13 @@ export const mapManuscripts = (sparqlBindings) => {
   const results = sparqlBindings.map(b => {
     return {
       id: b.id.value,
-      sdbmId: _.has(b, 'sdbmId',) ? b.sdbmId.value : 'Undefined',
+      sdbmId: _.has(b, 'sdbmId') ? b.sdbmId.value : '-',
       prefLabel: b.prefLabel.value,
-      author: _.has(b, 'author',) ? b.author.value.split('|') : 'Undefined',
-      timespan: _.has(b, 'timespan',) ? b.timespan.value.split('|') : 'Undefined',
-      creationPlace: _.has(b, 'creationPlace',) ? b.creationPlace.value.split('|') : 'Undefined',
-      material: _.has(b, 'material',) ? b.material.value.split('|') : 'Undefined',
-      language: _.has(b, 'language',) ? b.language.value.split('|') : 'Undefined',
+      author: _.has(b, 'author',) ? b.author.value.split('|') : '-',
+      timespan: _.has(b, 'timespan',) ? b.timespan.value.split('|') : '-',
+      creationPlace: _.has(b, 'creationPlace',) ? b.creationPlace.value.split('|') : '-',
+      material: _.has(b, 'material',) ? b.material.value.split('|') : '-',
+      language: _.has(b, 'language',) ? b.language.value.split('|') : '-',
     };
   });
   return results;