diff --git a/csrankings.js b/csrankings.js
index d6900ef304..8e17d0ba8c 100644
--- a/csrankings.js
+++ b/csrankings.js
@@ -447,8 +447,8 @@ var CSRankings = (function () {
                     deptCounts[dept] = 0;
                     deptNames[dept] = [];
                 }
-                deptNames[dept].push(name_2);
                 if (!(name_2 in CSRankings.aliases)) {
+                    deptNames[dept].push(name_2);
                     deptCounts[dept] += 1;
                 }
             }
@@ -656,23 +656,24 @@ var CSRankings = (function () {
                         ties = 0;
                     }
                 }
+                var esc = escape(dept);
                 s += "\n<tr><td>" + rank + "</td>";
                 s += "<td>"
                     + "<span onclick=\"CSRankings.toggleFaculty('" + dept + "')\" class=\"hovertip\" id=\"" + dept + "-widget\">" + "<font color=\"blue\">" + CSRankings.RightTriangle + "</span></font>&nbsp;"
                     + "<span onclick=\"CSRankings.toggleFaculty('" + dept + "')\" class=\"hovertip\">" + dept + "</span>";
                 s += "&nbsp;<font color=\"blue\">" + "<span onclick=\"CSRankings.toggleChart('"
-                    + escape(dept)
+                    + esc
                     + "')\" class=\"hovertip\" id=\""
-                    + escape(dept)
+                    + esc
                     + "-widget\">" + CSRankings.PieChart + "</span></font>";
-                //	    s += '<div style="display:none;" style="width: 100%; height: 350px;" id="' + escape(dept) + '">' + '</div>';
+                //	    s += '<div style="display:none;" style="width: 100%; height: 350px;" id="' + esc + '">' + '</div>';
                 s += "</td>";
                 s += '<td align="right">' + (Math.round(10.0 * v) / 10.0).toFixed(1) + "</td>";
                 s += '<td align="right">' + deptCounts[dept] + "<br />"; /* number of faculty */
                 s += "</td>";
                 s += "</tr>\n";
                 s += '<tr><td colspan="4"><div style="display:none;" style="width: 100%; height: 350px;" id="'
-                    + escape(dept)
+                    + esc
                     + '-chart">' + '</div></td></tr>';
                 s += '<tr><td colspan="4"><div style="display:none;" id="' + dept + '-faculty">' + univtext[dept] + '</div></td></tr>';
                 ties++;
diff --git a/csrankings.ts b/csrankings.ts
index 09e6d2aaaf..3104e146fd 100644
--- a/csrankings.ts
+++ b/csrankings.ts
@@ -608,8 +608,8 @@ class CSRankings {
 		    deptCounts[dept] = 0;
 		    deptNames[dept] = <Array<string>>[];
 		}
-		deptNames[dept].push(name);
 		if (!(name in CSRankings.aliases)) {
+		    deptNames[dept].push(name);
 		    deptCounts[dept] += 1;
 		}
 	    }
@@ -837,16 +837,17 @@ class CSRankings {
 			ties = 0;
 		    }
 		}
+		const esc = escape(dept);
 		s += "\n<tr><td>" + rank + "</td>";
 		s += "<td>"
 		    + "<span onclick=\"CSRankings.toggleFaculty('" + dept + "')\" class=\"hovertip\" id=\"" + dept + "-widget\">" + "<font color=\"blue\">" + CSRankings.RightTriangle + "</span></font>&nbsp;"
 		    + "<span onclick=\"CSRankings.toggleFaculty('" + dept + "')\" class=\"hovertip\">" + dept + "</span>";
 		s += "&nbsp;<font color=\"blue\">" + "<span onclick=\"CSRankings.toggleChart('"
-		    + escape(dept)
+		    + esc
 		    + "')\" class=\"hovertip\" id=\""
-		    + escape(dept)
+		    + esc
 		    + "-widget\">" + CSRankings.PieChart + "</span></font>";
-		//	    s += '<div style="display:none;" style="width: 100%; height: 350px;" id="' + escape(dept) + '">' + '</div>';
+		//	    s += '<div style="display:none;" style="width: 100%; height: 350px;" id="' + esc + '">' + '</div>';
 		s += "</td>";
 
 		s += '<td align="right">' + (Math.round(10.0 * v) / 10.0).toFixed(1)  + "</td>";
@@ -854,7 +855,7 @@ class CSRankings {
 		s += "</td>";
 		s += "</tr>\n";
 		s += '<tr><td colspan="4"><div style="display:none;" style="width: 100%; height: 350px;" id="'
-		    + escape(dept)
+		    + esc
 		    + '-chart">' + '</div></td></tr>';
 		s += '<tr><td colspan="4"><div style="display:none;" id="' + dept + '-faculty">' + univtext[dept] + '</div></td></tr>';
 		ties++;
diff --git a/dblp-aliases.csv b/dblp-aliases.csv
index 2830a24b10..469e5c448a 100644
--- a/dblp-aliases.csv
+++ b/dblp-aliases.csv
@@ -3033,7 +3033,6 @@ Asaf Zur,Asaf Tsur
 Asbjorn Hovsto,Asbjørn Hovstø
 Asen Asenov,A. Asenov
 Ashis Kumar Dhara,Ashis K. Dhara
-Ashish Choudhary,Ashish Choudhury
 Ashish K. Roy,Ashish Roy
 Ashish Prakash Agalgaonkar,Ashish P. Agalgaonkar
 Ashish S. MacAden,Ashish MacAden
diff --git a/faculty-affiliations.csv b/faculty-affiliations.csv
index 04627b460b..a71f20f968 100644
--- a/faculty-affiliations.csv
+++ b/faculty-affiliations.csv
@@ -1693,7 +1693,6 @@ Yuval Kochman , Hebrew University of Jerusalem
 Yuval Rabani , Hebrew University of Jerusalem
 Amit Chattopadhyay , IIIT Bangalore
 Amit Prakash , IIIT Bangalore
-Ashish Choudhary , IIIT Bangalore
 Ashish Choudhury , IIIT Bangalore
 Balaji Parthasarathy , IIIT Bangalore
 Chandrashekar Ramanathan , IIIT Bangalore
diff --git a/generated-author-info.csv b/generated-author-info.csv
index b524c435ef..7b60ad7693 100644
--- a/generated-author-info.csv
+++ b/generated-author-info.csv
@@ -51260,7 +51260,6 @@ Michael Ben-Or,Hebrew University of Jerusalem,crypt,1.0,0.142857142857,1988
 Shafi Goldwasser,Massachusetts Institute of Technology,crypt,1.0,0.142857142857,1988
 Phillip Rogaway,University of California - Davis,crypt,1.0,0.142857142857,1988
 Arpita Patra,IISc Bangalore,crypt,1.0,0.25,2009
-Ashish Choudhary,IIIT Bangalore,crypt,1.0,0.25,2009
 C. Pandu Rangan,IIT Madras,crypt,1.0,0.25,2009
 Gilles Brassard,University of Montreal,crypt,2.0,1.25,1982
 Russell Impagliazzo,University of California - San Diego,crypt,1.0,0.5,1988