diff --git a/kallithea/templates/changeset/diff_block.html b/kallithea/templates/changeset/diff_block.html
--- a/kallithea/templates/changeset/diff_block.html
+++ b/kallithea/templates/changeset/diff_block.html
@@ -9,34 +9,38 @@
 </div>
 <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
 %for id_fid, (a_rev, cs_rev, op, filename, diff, stats) in change.iteritems():
+    <%
+    url_fid = h.FID(cs_rev, filename)
+    a_repo_name = cs_repo_name = c.repo_name
+    %>
     <div id="${id_fid}_target" style="clear:both;margin-top:25px"></div>
     <div id="${id_fid}" class="diffblock margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
-                    ${h.link_to_if(op!='D',h.safe_unicode(filename),h.url('files_home',repo_name=c.repo_name,
+                    ${h.link_to_if(op!='D',h.safe_unicode(filename),h.url('files_home',repo_name=cs_repo_name,
                     revision=cs_rev,f_path=h.safe_unicode(filename)))}
                 </div>
                 <div class="diff-actions">
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">
                       <i class="icon-file-code"></i>
                   </a>
-                  <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
+                  <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i>
                   </a>
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" class="tooltip" title="${_('Raw diff')}">
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" class="tooltip" title="${_('Raw diff')}">
                       <i class="icon-diff"></i>
                   </a>
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='download')}" class="tooltip" title="${_('Download diff')}">
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='download')}" class="tooltip" title="${_('Download diff')}">
                       <i class="icon-floppy"></i>
                   </a>
-                  ${c.ignorews_url(request.GET, h.FID(cs_rev,filename))}
-                  ${c.context_url(request.GET, h.FID(cs_rev,filename))}
+                  ${c.ignorews_url(request.GET, url_fid)}
+                  ${c.context_url(request.GET, url_fid)}
                 </div>
                 <span style="float:right;margin-top:-3px">
                     <label>
                         ${_('Show inline comments')}
-                        ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs_rev,filename))}
+                        ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=url_fid)}
                     </label>
                 </span>
             </div>
@@ -51,11 +55,11 @@
               <div style="font-size: 0">
                 %if op in 'DM':
                   <img id="${id_fid}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
-                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.a_rev,f_path=filename)}" />
+                      realsrc="${h.url('files_raw_home',repo_name=a_repo_name,revision=a_rev,f_path=filename)}" />
                 %endif
                 %if op in 'AM':
                   <img id="${id_fid}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"
-                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs_rev,f_path=filename)}" />
+                      realsrc="${h.url('files_raw_home',repo_name=cs_repo_name,revision=cs_rev,f_path=filename)}" />
                 %endif
               </div>
             %endif
@@ -73,9 +77,15 @@
   %for fid, ch, f, stat in files:
     <%
     op, filename, diff = changes[fid]
+    id_fid = h.FID('', filename)
+    url_fid = '' # or None
+    a_rev, cs_rev = c.a_rev, c.cs_rev
+    a_repo_name, cs_repo_name = c.a_repo.repo_name, c.cs_repo.repo_name
+    a_ref_type, a_ref_name = c.a_ref_type, c.a_ref_name
+    cs_ref_type, cs_ref_name = c.cs_ref_type, c.cs_ref_name
     %>
-    <div id="${h.FID('', filename)}_target" style="clear:both;margin-top:25px"></div>
-    <div id="${h.FID('', filename)}" class="diffblock margined comm">
+    <div id="${id_fid}_target" style="clear:both;margin-top:25px"></div>
+    <div id="${id_fid}" class="diffblock margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
@@ -83,29 +93,29 @@
                     ## TODO: link to ancestor and head of other instead of exactly other
                     %if op == 'A':
                       ${_('Added')}
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filename, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
                     %elif op == 'M':
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filename, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
                       <i class="icon-right"></i>
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filename, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
                     %elif op == 'D':
                       ${_('Deleted')}
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filename, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
                     %elif op == 'R':
                       ${_('Renamed')}
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filename, revision=c.a_rev)}">${h.short_ref(c.a_ref_type, c.a_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
                       <i class="icon-right"></i>
-                      <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filename, revision=c.cs_rev)}">${h.short_ref(c.cs_ref_type, c.cs_ref_name)}</a>
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
                     %else:
                       ${op}???
                     %endif
                 </div>
                 <div class="diff-actions">
-                  <a href="${h.url('files_diff_2way_home',repo_name=c.cs_repo.repo_name,f_path=h.safe_unicode(filename),diff1=c.a_rev,diff2=c.cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
+                  <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff1=a_rev,diff2=cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i>
                   </a>
-                  ${c.ignorews_url(request.GET)}
-                  ${c.context_url(request.GET)}
+                  ${c.ignorews_url(request.GET, url_fid)}
+                  ${c.context_url(request.GET, url_fid)}
                 </div>
             </div>
         </div>
@@ -114,16 +124,16 @@
             %if filename.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:
               <div class="btn btn-image-diff-show">Show images</div>
               %if op == 'M':
-                <div id="${h.FID('',filename)}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>
+                <div id="${id_fid}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>
               %endif
               <div style="font-size: 0">
                 %if op in 'DM':
-                  <img id="${h.FID('',filename)}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
-                      realsrc="${h.url('files_raw_home',repo_name=c.a_repo.repo_name,revision=c.a_rev,f_path=filename)}" />
+                  <img id="${id_fid}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
+                      realsrc="${h.url('files_raw_home',repo_name=a_repo_name,revision=a_rev,f_path=filename)}" />
                 %endif
                 %if op in 'AM':
-                  <img id="${h.FID('',filename)}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"
-                      realsrc="${h.url('files_raw_home',repo_name=c.cs_repo.repo_name,revision=c.cs_rev,f_path=filename)}" />
+                  <img id="${id_fid}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"
+                      realsrc="${h.url('files_raw_home',repo_name=cs_repo_name,revision=cs_rev,f_path=filename)}" />
                 %endif
               </div>
             %endif