diff --git a/src/reducers/schema/sourceSchema.js b/src/reducers/schema/sourceSchema.js
index 81c99f5..3dc17dd 100644
--- a/src/reducers/schema/sourceSchema.js
+++ b/src/reducers/schema/sourceSchema.js
@@ -8,9 +8,9 @@ const sourceSchema = Joi.object().keys({
   affil_2:        Joi.string().allow(''),
   url:            Joi.string().allow(''),
   title:          Joi.string().allow(''),
-  parent:         Joi.string(),
+  parent:         Joi.string().allow(''),
   author:         Joi.string().allow(''),
-  date:           Joi.string(),
+  date:           Joi.string().allow(''),
   notes:          Joi.string().allow('')
 });
 
diff --git a/src/reducers/utils/validators.js b/src/reducers/utils/validators.js
index 9831962..42bf3d3 100644
--- a/src/reducers/utils/validators.js
+++ b/src/reducers/utils/validators.js
@@ -60,7 +60,7 @@ export function validateDomain (domain) {
     categories: [],
     sites: [],
     narratives: [],
-    sources: [],
+    sources: {},
     notifications: domain.notifications,
     tags: {}
   }
@@ -73,34 +73,47 @@ export function validateDomain (domain) {
     sources: [],
   }
 
-  function validateItem(item, domainClass, schema) {
+  function validateArrayItem(item, domainKey, schema) {
     const result = Joi.validate(item, schema);
     if (result.error !== null) {
       const id = item.id || '-';
-      const domainStr = capitalize(domainClass);
+      const domainStr = capitalize(domainKey);
       const error = makeError(domainStr, id, result.error.message);
 
-      discardedDomain[domainClass].push(Object.assign(item, { error }));
+      discardedDomain[domainKey].push(Object.assign(item, { error }));
     } else {
-      sanitizedDomain[domainClass].push(item);
+      sanitizedDomain[domainKey].push(item);
     }
   }
 
-  domain.events.forEach(event => {
-    validateItem(event, 'events', eventSchema);
-  });
-  domain.categories.forEach(category => {
-    validateItem(category, 'categories', categorySchema);
-  });
-  domain.sites.forEach(site => {
-    validateItem(site, 'sites', siteSchema);
-  });
-  domain.narratives.forEach(narrative => {
-    validateItem(narrative, 'narratives', narrativeSchema);
-  });
-  domain.sources.forEach(source => {
-    validateItem(source, 'sources', sourceSchema);
-  })
+  function validateArray(items, domainKey, schema) {
+    items.forEach(item => {
+      validateArrayItem(item, domainKey, schema)
+    })
+  }
+
+  function validateObject(obj, domainKey, itemSchema) {
+    Object.keys(obj).forEach(key => {
+      const vl = obj[key]
+      const result = Joi.validate(vl, itemSchema)
+      if (result.error !== null) {
+        const id = vl.id || '-'
+        const domainStr = capitalize(domainKey)
+        discardedDomain[domainKey].push({
+          ...vl,
+          error: makeError(domainStr, id, result.error.message)
+        })
+      } else {
+        sanitizedDomain[domainKey][key] = vl
+      }
+    })
+  }
+
+  validateArray(domain.events, 'events', eventSchema);
+  validateArray(domain.categories, 'categories', categorySchema);
+  validateArray(domain.sites, 'sites', siteSchema);
+  validateArray(domain.narratives, 'narratives', narrativeSchema);
+  validateObject(domain.sources, 'sources', sourceSchema);
 
 
   // Message the number of failed items in domain
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 8969136..9f5fa16 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -164,8 +164,10 @@ export const selectSelected = createSelector(
     if (selected.length === 0) {
       return []
     }
-    const sourceIds = selected.map(e => e.source)
-    const srcs = sources.filter(s => s.id.indexOf(sourceIds) > -1)
+    const srcs = selected
+      .map(e => e.source)
+      .map(id => sources[id])
+
     return selected.map((s, idx) => ({
       ...s,
       source: srcs[idx]