diff --git a/src/OpenStreetBrowserLoader.js b/src/OpenStreetBrowserLoader.js
index 921fad08..dd937792 100644
--- a/src/OpenStreetBrowserLoader.js
+++ b/src/OpenStreetBrowserLoader.js
@@ -46,7 +46,6 @@ class OpenStreetBrowserLoader {
     opt.repositoryId = ids.repositoryId
 
     this.getRepository(ids.repositoryId, opt, (err, repository) => {
-      const repoData = repository.data
       // maybe loaded in the meantime?
       if (ids.fullId in this.categories) {
         return callback(null, this.categories[ids.fullId])
@@ -56,24 +55,29 @@ class OpenStreetBrowserLoader {
         return callback(err, null)
       }
 
-      if (!(ids.entityId in repoData.categories)) {
-        return callback(new Error('category "' + ids.entityId + '" not defined'), null)
-      }
-
-      this.getCategoryFromData(ids.id, opt, repoData.categories[ids.entityId], function (err, category) {
-        if (category) {
-          category.setMap(this.map)
+      repository.getCategory(ids.entityId, opt, (err, data) => {
+        // maybe loaded in the meantime?
+        if (ids.fullId in this.categories) {
+          return callback(null, this.categories[ids.fullId])
         }
 
-        callback(err, category)
-      }.bind(this))
-    }.bind(this))
+        if (err) { return callback(err) }
+
+        this.getCategoryFromData(ids.id, opt, data, (err, category) =>{
+          if (category) {
+            category.setMap(this.map)
+          }
+
+          callback(err, category)
+        })
+      })
+    })
   }
 
   /**
    * @param string repo ID of the repository
-   * @parapm [object] options Options.
-   * @waram {boolean} [options.force=false] Whether repository should be reload or not.
+   * @param [object] options Options.
+   * @param {boolean} [options.force=false] Whether repository should be reloaded or not.
    * @param function callback Callback which will be called with (err, repoData)
    */
   getRepo (repo, options, callback) {
@@ -129,6 +133,12 @@ class OpenStreetBrowserLoader {
     req.send()
   }
 
+  /**
+   * @param string repo ID of the repository
+   * @param [object] options Options.
+   * @param {boolean} [options.force=false] Whether repository should be reloaded or not.
+   * @param function callback Callback which will be called with (err, repository)
+   */
   getRepository (id, options, callback) {
     if (id in this.repositories) {
       return callback(null, this.repositories[id])
@@ -169,7 +179,7 @@ class OpenStreetBrowserLoader {
     opt.templateId = ids.entityId
     opt.repositoryId = ids.repositoryId
 
-    this.getRepo(ids.repositoryId, opt, function (err, repoData) {
+    this.getRepository(ids.repositoryId, opt, (err, repository) => {
       // maybe loaded in the meantime?
       if (ids.fullId in this.templates) {
         return callback(null, this.templates[ids.fullId])
@@ -179,14 +189,19 @@ class OpenStreetBrowserLoader {
         return callback(err, null)
       }
 
-      if (!repoData.templates || !(ids.entityId in repoData.templates)) {
-        return callback(new Error('template not defined'), null)
-      }
+      repository.getTemplate(ids.entityId, opt, (err, data) => {
+        // maybe loaded in the meantime?
+        if (ids.fullId in this.templates) {
+          return callback(null, this.templates[ids.fullId])
+        }
+
+        if (err) { return callback(err) }
 
-      this.templates[ids.fullId] = OverpassLayer.twig.twig({ data: repoData.templates[ids.entityId], autoescape: true })
+        this.templates[ids.fullId] = OverpassLayer.twig.twig({ data, autoescape: true })
 
-      callback(null, this.templates[ids.fullId])
-    }.bind(this))
+        callback(null, this.templates[ids.fullId])
+      })
+    })
   }
 
   getCategoryFromData (id, options, data, callback) {
diff --git a/src/Repository.js b/src/Repository.js
index c5e7de30..b819666d 100644
--- a/src/Repository.js
+++ b/src/Repository.js
@@ -5,4 +5,20 @@ module.exports = class Repository {
 
     this.lang = this.data.lang || {}
   }
+
+  getCategory (id, options, callback) {
+    if (!(id in this.data.categories)) {
+      return callback(new Error('Repository ' + this.id + ': Category "' + id + '" not defined'), null)
+    }
+
+    callback(null, this.data.categories[id])
+  }
+
+  getTemplate (id, options, callback) {
+    if (!(id in this.data.templates)) {
+      return callback(new Error('Repository ' + this.id + ': Template "' + id + '" not defined'), null)
+    }
+
+    callback(null, this.data.templates[id])
+  }
 }