diff --git a/app/main/views.py b/app/main/views.py
index 773aaf08..3fef5a04 100644
--- a/app/main/views.py
+++ b/app/main/views.py
@@ -31,7 +31,7 @@ def corpus(corpus_id):
         files[file]['path'] = os.path.join(file)
 
     return render_template('main/corpora/corpus.html.j2',
-                           corpus_id=corpus.id,
+                           corpus=corpus,
                            files=files,
                            title='Corpus')
 
@@ -117,7 +117,7 @@ def job(job_id):
 
     return render_template('main/jobs/job.html.j2',
                            files=files,
-                           job_id=job.id,
+                           job=job,
                            title='Job')
 
 
diff --git a/app/templates/main/corpora/corpus.html.j2 b/app/templates/main/corpora/corpus.html.j2
index fe6c6832..590c14e7 100644
--- a/app/templates/main/corpora/corpus.html.j2
+++ b/app/templates/main/corpora/corpus.html.j2
@@ -2,7 +2,7 @@
 
 {% block page_content %}
 <script>
-  var CORPUS_ID = {{ corpus_id }}
+  var CORPUS_ID = {{ corpus.id }}
 
   class InformationUpdater {
     constructor(corpusId) {
@@ -79,7 +79,7 @@
       <span class="card-title">Files</span>
       <p>
       {% for file in files %}
-      <a href="{{ url_for('main.corpus_download', corpus_id=corpus_id, file=files[file]['path']) }}" class="waves-effect waves-light btn-small">
+      <a href="{{ url_for('main.corpus_download', corpus_id=corpus.id, file=files[file]['path']) }}" class="waves-effect waves-light btn-small">
         <i class="material-icons left">file_download</i>{{ file }}
       </a>
       {% endfor %}
diff --git a/app/templates/main/jobs/job.html.j2 b/app/templates/main/jobs/job.html.j2
index bf655dfb..9bab4f61 100644
--- a/app/templates/main/jobs/job.html.j2
+++ b/app/templates/main/jobs/job.html.j2
@@ -2,8 +2,7 @@
 
 {% block page_content %}
 <script>
-  var url = window.location.pathname;
-  var JOB_ID = url.substring(url.lastIndexOf('/') + 1);
+  var JOB_ID = {{ job.id }}
 
   class InformationUpdater {
     constructor(jobId) {