diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -268,10 +268,10 @@ class ChangesetController(BaseRepoContro
         ccmodel = ChangesetCommentsModel()
 
         ccmodel.create(text=request.POST.get('text'),
-                       repo_id=c.rhodecode_db_repo.repo_id, 
-                       user_id=c.rhodecode_user.user_id, 
-                       revision=revision, f_path=request.POST.get('f_path'), 
-                       line_no = request.POST.get('line'))
+                       repo_id=c.rhodecode_db_repo.repo_id,
+                       user_id=c.rhodecode_user.user_id,
+                       revision=revision, f_path=request.POST.get('f_path'),
+                       line_no=request.POST.get('line'))
 
         return redirect(h.url('changeset_home', repo_name=repo_name,
                               revision=revision))
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -33,7 +33,7 @@ from webhelpers.text import chop_at, col
 from webhelpers.date import time_ago_in_words
 from webhelpers.paginate import Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
-    convert_boolean_attrs, NotGiven
+    convert_boolean_attrs, NotGiven, _make_safe_id_component
 
 from vcs.utils.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
@@ -51,7 +51,7 @@ def _reset(name, value=None, id=NotGiven
     return HTML.input(**attrs)
 
 reset = _reset
-
+safeid = _make_safe_id_component
 
 def get_token():
     """Return the current authentication token, creating one if one doesn't
diff --git a/rhodecode/public/css/diff.css b/rhodecode/public/css/diff.css
--- a/rhodecode/public/css/diff.css
+++ b/rhodecode/public/css/diff.css
@@ -34,10 +34,6 @@ table.code-difftable{
 	border-collapse: collapse;
 	width: 99%;
 }
-table.code-difftable td:target *{
-	background:  repeat scroll 0 0 #FFFFBE !important;
-	text-decoration: underline;
-}
 
 table.code-difftable td {
     padding: 0 !important; 
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -63,7 +63,7 @@
 		             </div>                  
 		                 %if len(c.changeset.parents)>1:
 		                 <div class="merge">
-		                     ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>
+		                     ${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/>
 		                 </div>
 		                 %endif
 		                 
@@ -92,8 +92,7 @@
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 	                    <div class="cs_${change}">
-		                    <div class="node">${h.link_to(h.safe_unicode(filenode.path),
-		                                        h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div>
+		                    <div class="node">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor='C-%s-%s' % (h.short_id(filenode.changeset.raw_id),h.safeid(h.safe_unicode(filenode.path)))))}</div>
 		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 	                    </div>
 	                %endfor
@@ -109,7 +108,7 @@
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div class="diffblock  margined">
-			<div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header">
+			<div id="${'C-%s-%s' % (h.short_id(filenode.changeset.raw_id),h.safeid(h.safe_unicode(filenode.path)))}" class="code-header">
 				<div class="changeset_header">
 					<span class="changeset_file">
 						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,