diff --git a/lib/domains/abused.txt b/lib/domains/abused.txt
index 65783b7f07..96169e11fb 100644
--- a/lib/domains/abused.txt
+++ b/lib/domains/abused.txt
@@ -40,6 +40,7 @@ oshs.edu.ba
 bup.edu.bd
 green.ac.bd
 me.buet.ac.bd
+buet.ac.bd
 vu.edu.bd
 bub.edu.bh
 gulfuniversity.edu.bh
@@ -125,7 +126,6 @@ unipacifico.edu.co
 unipamplona.edu.co
 unisalle.edu.co
 unisinu.edu.co
-universidadean.edu.co
 upb.edu.co
 upn.edu.co
 ustabuca.edu.co
@@ -1340,4 +1340,28 @@ ogr.deu.edu.tr
 gtec.ac.kr
 jmail.ac.kr
 epgunheval.edu.pe
-iskolarngbayan.pup.edu.ph
\ No newline at end of file
+iskolarngbayan.pup.edu.ph
+upm.edu.my
+uptc.edu.co
+bu.ac.kr
+niet.co.in
+kmitl.ac.th
+ksiu.edu.eg
+msgsu.edu.tr
+luanar.ac.mw
+unfv.edu.pe
+kpu.ac.kr
+uptecamac.edu.mx
+iccs.ac.in
+uniopet.edu.br
+dav.edu.vn
+hcmiu.edu.vn
+students.mdis.edu.sg
+oxfordcollege.edu.np
+students.nsbm.ac.lk
+tesjo.edu.mx
+unibe.edu.do
+bachkhoahanoi.edu.vn
+o365.fayoum.edu.eg
+ufpr.br
+ntthnue.edu.vn
\ No newline at end of file
diff --git a/lib/domains/ac/in/delhitechnicalcampus.txt b/lib/domains/ac/in/delhitechnicalcampus.txt
new file mode 100644
index 0000000000..c4e5f2c229
--- /dev/null
+++ b/lib/domains/ac/in/delhitechnicalcampus.txt
@@ -0,0 +1,3 @@
+Delhi Technical Campus
+Delhi Technical Campus
+
diff --git a/lib/domains/au/edu/nas.txt b/lib/domains/au/edu/nas.txt
new file mode 100644
index 0000000000..6a2f216b22
--- /dev/null
+++ b/lib/domains/au/edu/nas.txt
@@ -0,0 +1 @@
+National Art School
diff --git a/lib/domains/au/edu/vic/braemar.txt b/lib/domains/au/edu/vic/braemar.txt
new file mode 100644
index 0000000000..052ba22bed
--- /dev/null
+++ b/lib/domains/au/edu/vic/braemar.txt
@@ -0,0 +1 @@
+Braemar College
\ No newline at end of file
diff --git a/lib/domains/bd/edu/mmacademy.txt b/lib/domains/bd/edu/mmacademy.txt
new file mode 100644
index 0000000000..feb9e3b2d6
--- /dev/null
+++ b/lib/domains/bd/edu/mmacademy.txt
@@ -0,0 +1,2 @@
+মুসলিম মডার্ন একাডেমি
+Muslim Modern Academy
\ No newline at end of file
diff --git a/lib/domains/be/cssm-student.txt b/lib/domains/be/cssm-student.txt
new file mode 100644
index 0000000000..1ff309835a
--- /dev/null
+++ b/lib/domains/be/cssm-student.txt
@@ -0,0 +1 @@
+Sainte-Marie Namur
\ No newline at end of file
diff --git a/lib/domains/br/edu/fapipinhais/cs.txt b/lib/domains/br/edu/fapipinhais/cs.txt
new file mode 100644
index 0000000000..843a2004f3
--- /dev/null
+++ b/lib/domains/br/edu/fapipinhais/cs.txt
@@ -0,0 +1 @@
+FAPI | Centro Universitário de Pinhais
\ No newline at end of file
diff --git a/lib/domains/br/edu/fipecafi.txt b/lib/domains/br/edu/fipecafi.txt
new file mode 100644
index 0000000000..8def7c6ed5
--- /dev/null
+++ b/lib/domains/br/edu/fipecafi.txt
@@ -0,0 +1 @@
+FIPECAFI - Cultura Contábil, Atuarial e Financeira
\ No newline at end of file
diff --git a/lib/domains/br/edu/uniopet.txt b/lib/domains/br/edu/uniopet.txt
deleted file mode 100644
index 5e092301dd..0000000000
--- a/lib/domains/br/edu/uniopet.txt
+++ /dev/null
@@ -1 +0,0 @@
-Centro Universitario Opet - uniopet
\ No newline at end of file
diff --git a/lib/domains/br/ufpr.txt b/lib/domains/br/ufpr.txt
deleted file mode 100644
index c9e72c5564..0000000000
--- a/lib/domains/br/ufpr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidade Federal do Paraná
diff --git a/lib/domains/ca/senecapolytechnic.txt b/lib/domains/ca/senecapolytechnic.txt
new file mode 100644
index 0000000000..1b1f6c4f7d
--- /dev/null
+++ b/lib/domains/ca/senecapolytechnic.txt
@@ -0,0 +1,2 @@
+Seneca Polytechnic
+Seneca Polytechnic
\ No newline at end of file
diff --git a/lib/domains/co/edu/universidadean.txt b/lib/domains/co/edu/universidadean.txt
new file mode 100644
index 0000000000..ed8b4b5e75
--- /dev/null
+++ b/lib/domains/co/edu/universidadean.txt
@@ -0,0 +1,3 @@
+Universidad Ean
+Emprendiendo un mundo mejor
+Escuela de Administración de Negocios
\ No newline at end of file
diff --git a/lib/domains/co/edu/uptc.txt b/lib/domains/co/edu/uptc.txt
deleted file mode 100644
index 7d0dafcf1d..0000000000
--- a/lib/domains/co/edu/uptc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Pedagógica y Tecnológica de Colombia
diff --git a/lib/domains/com/campus-numerique-in-the-alps.txt b/lib/domains/com/campus-numerique-in-the-alps.txt
deleted file mode 100644
index ead845173d..0000000000
--- a/lib/domains/com/campus-numerique-in-the-alps.txt
+++ /dev/null
@@ -1 +0,0 @@
-Campus Numérique In The Alps
diff --git a/lib/domains/com/poleformation74.txt b/lib/domains/com/poleformation74.txt
new file mode 100644
index 0000000000..cad4ab8e53
--- /dev/null
+++ b/lib/domains/com/poleformation74.txt
@@ -0,0 +1 @@
+Pole Formation de la Haute Savoie
\ No newline at end of file
diff --git a/lib/domains/de/berlin-international.txt b/lib/domains/de/berlin-international.txt
new file mode 100644
index 0000000000..1f441de44e
--- /dev/null
+++ b/lib/domains/de/berlin-international.txt
@@ -0,0 +1 @@
+Berlin International University of Applied Sciences
diff --git a/lib/domains/de/gymbla.txt b/lib/domains/de/gymbla.txt
new file mode 100644
index 0000000000..98aac6022f
--- /dev/null
+++ b/lib/domains/de/gymbla.txt
@@ -0,0 +1 @@
+Gymnasium Blankenese
\ No newline at end of file
diff --git a/lib/domains/de/nuernberg/rdf.txt b/lib/domains/de/nuernberg/rdf.txt
new file mode 100644
index 0000000000..3b0b2d33f8
--- /dev/null
+++ b/lib/domains/de/nuernberg/rdf.txt
@@ -0,0 +1 @@
+Rudolf-Diesel-Fachschule
diff --git a/lib/domains/do/edu/unibe.txt b/lib/domains/do/edu/unibe.txt
deleted file mode 100644
index 22cef932f1..0000000000
--- a/lib/domains/do/edu/unibe.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Universidad Iberoamericana
-Universidad Iberoamericana
diff --git a/lib/domains/ec/edu/condamine.txt b/lib/domains/ec/edu/condamine.txt
new file mode 100644
index 0000000000..80c2e8fe1d
--- /dev/null
+++ b/lib/domains/ec/edu/condamine.txt
@@ -0,0 +1,2 @@
+Lycée la Condamine Quito
+La Condamine High School Quito
\ No newline at end of file
diff --git a/lib/domains/edu/cerritos.txt b/lib/domains/edu/cerritos.txt
new file mode 100644
index 0000000000..9fd977e849
--- /dev/null
+++ b/lib/domains/edu/cerritos.txt
@@ -0,0 +1 @@
+Cerritos College
\ No newline at end of file
diff --git a/lib/domains/edu/claflin.txt b/lib/domains/edu/claflin.txt
new file mode 100644
index 0000000000..1a4aed84de
--- /dev/null
+++ b/lib/domains/edu/claflin.txt
@@ -0,0 +1 @@
+Claflin University
\ No newline at end of file
diff --git a/lib/domains/edu/clcillinois.txt b/lib/domains/edu/clcillinois.txt
new file mode 100644
index 0000000000..2d2fa4b17d
--- /dev/null
+++ b/lib/domains/edu/clcillinois.txt
@@ -0,0 +1 @@
+College of Lake County
\ No newline at end of file
diff --git a/lib/domains/edu/millersville.txt b/lib/domains/edu/millersville.txt
new file mode 100644
index 0000000000..a57b00509b
--- /dev/null
+++ b/lib/domains/edu/millersville.txt
@@ -0,0 +1 @@
+Millersville University of Pennsylvania
\ No newline at end of file
diff --git a/lib/domains/edu/misericordia.txt b/lib/domains/edu/misericordia.txt
new file mode 100644
index 0000000000..af9ed2acfb
--- /dev/null
+++ b/lib/domains/edu/misericordia.txt
@@ -0,0 +1,2 @@
+Misericordia University
+Misericordia University
\ No newline at end of file
diff --git a/lib/domains/edu/shawu.txt b/lib/domains/edu/shawu.txt
new file mode 100644
index 0000000000..77a75afffc
--- /dev/null
+++ b/lib/domains/edu/shawu.txt
@@ -0,0 +1 @@
+Shaw University
\ No newline at end of file
diff --git a/lib/domains/edu/tvcc.txt b/lib/domains/edu/tvcc.txt
new file mode 100644
index 0000000000..5a04346753
--- /dev/null
+++ b/lib/domains/edu/tvcc.txt
@@ -0,0 +1 @@
+Trinity Valley Community College
\ No newline at end of file
diff --git a/lib/domains/eg/edu/fayoum.txt b/lib/domains/eg/edu/fayoum.txt
deleted file mode 100644
index b3b1c58389..0000000000
--- a/lib/domains/eg/edu/fayoum.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fayoum University
diff --git a/lib/domains/eg/edu/ksiu.txt b/lib/domains/eg/edu/ksiu.txt
deleted file mode 100644
index c61e9c5a80..0000000000
--- a/lib/domains/eg/edu/ksiu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-International King Salman University
-International King Salman University
\ No newline at end of file
diff --git a/lib/domains/eg/edu/znu/ai.txt b/lib/domains/eg/edu/znu/ai.txt
new file mode 100644
index 0000000000..d828bbbdad
--- /dev/null
+++ b/lib/domains/eg/edu/znu/ai.txt
@@ -0,0 +1,2 @@
+جامعة الزقازيق الاهلية
+Zagazig National University
diff --git a/lib/domains/eg/edu/znu/ais.txt b/lib/domains/eg/edu/znu/ais.txt
new file mode 100644
index 0000000000..d828bbbdad
--- /dev/null
+++ b/lib/domains/eg/edu/znu/ais.txt
@@ -0,0 +1,2 @@
+جامعة الزقازيق الاهلية
+Zagazig National University
diff --git a/lib/domains/eg/edu/znu/meceng.txt b/lib/domains/eg/edu/znu/meceng.txt
new file mode 100644
index 0000000000..d828bbbdad
--- /dev/null
+++ b/lib/domains/eg/edu/znu/meceng.txt
@@ -0,0 +1,2 @@
+جامعة الزقازيق الاهلية
+Zagazig National University
diff --git a/lib/domains/eg/edu/znu/medinf.txt b/lib/domains/eg/edu/znu/medinf.txt
new file mode 100644
index 0000000000..d828bbbdad
--- /dev/null
+++ b/lib/domains/eg/edu/znu/medinf.txt
@@ -0,0 +1,2 @@
+جامعة الزقازيق الاهلية
+Zagazig National University
diff --git a/lib/domains/eg/edu/znu/seng.txt b/lib/domains/eg/edu/znu/seng.txt
new file mode 100644
index 0000000000..d828bbbdad
--- /dev/null
+++ b/lib/domains/eg/edu/znu/seng.txt
@@ -0,0 +1,2 @@
+جامعة الزقازيق الاهلية
+Zagazig National University
diff --git a/lib/domains/fr/formateursifa.txt b/lib/domains/fr/formateursifa.txt
new file mode 100644
index 0000000000..eb0bf54e27
--- /dev/null
+++ b/lib/domains/fr/formateursifa.txt
@@ -0,0 +1 @@
+Metz Numeric School
\ No newline at end of file
diff --git a/lib/domains/gh/edu/kstu.txt b/lib/domains/gh/edu/kstu.txt
new file mode 100644
index 0000000000..463ca275fb
--- /dev/null
+++ b/lib/domains/gh/edu/kstu.txt
@@ -0,0 +1 @@
+Kumasi Technical University
diff --git a/lib/domains/gh/edu/upsa.txt b/lib/domains/gh/edu/upsa.txt
new file mode 100644
index 0000000000..445d22929f
--- /dev/null
+++ b/lib/domains/gh/edu/upsa.txt
@@ -0,0 +1 @@
+University of Professional Studies, Accra (UPSA)
\ No newline at end of file
diff --git a/lib/domains/id/ac/amikomsolo/mhs.txt b/lib/domains/id/ac/amikomsolo/mhs.txt
new file mode 100644
index 0000000000..efb4673913
--- /dev/null
+++ b/lib/domains/id/ac/amikomsolo/mhs.txt
@@ -0,0 +1,2 @@
+STIMIK AMIKOM Surakarta
+STIMIK AMIKOM Surakarta
\ No newline at end of file
diff --git a/lib/domains/id/sch/smksatriakendari.txt b/lib/domains/id/sch/smksatriakendari.txt
new file mode 100644
index 0000000000..5b354dbb92
--- /dev/null
+++ b/lib/domains/id/sch/smksatriakendari.txt
@@ -0,0 +1 @@
+SMKS SATRIA KENDARI
\ No newline at end of file
diff --git a/lib/domains/ie/ricecollege.txt b/lib/domains/ie/ricecollege.txt
new file mode 100644
index 0000000000..17df1b19b2
--- /dev/null
+++ b/lib/domains/ie/ricecollege.txt
@@ -0,0 +1 @@
+Rice College Ennis
diff --git a/lib/domains/ie/ricecollege/student.txt b/lib/domains/ie/ricecollege/student.txt
deleted file mode 100644
index 005e30dabe..0000000000
--- a/lib/domains/ie/ricecollege/student.txt
+++ /dev/null
@@ -1 +0,0 @@
-Rice College
\ No newline at end of file
diff --git a/lib/domains/in/ac/cvr.txt b/lib/domains/in/ac/cvr.txt
new file mode 100644
index 0000000000..457d3ab724
--- /dev/null
+++ b/lib/domains/in/ac/cvr.txt
@@ -0,0 +1 @@
+CVR College of Enginnering
\ No newline at end of file
diff --git a/lib/domains/in/ac/du/cvs.txt b/lib/domains/in/ac/du/cvs.txt
new file mode 100644
index 0000000000..2df0708f0b
--- /dev/null
+++ b/lib/domains/in/ac/du/cvs.txt
@@ -0,0 +1,2 @@
+College Of Vocational Studies, Delhi University
+College Of Vocational Studies, Delhi University
\ No newline at end of file
diff --git a/lib/domains/in/ac/govtsciencecollegedurg.txt b/lib/domains/in/ac/govtsciencecollegedurg.txt
new file mode 100644
index 0000000000..85773f03a1
--- /dev/null
+++ b/lib/domains/in/ac/govtsciencecollegedurg.txt
@@ -0,0 +1 @@
+GOVT. V.Y.T.PG. AUTONOMOUS COLLEGE, DURG, CHHATTISGARH
\ No newline at end of file
diff --git a/lib/domains/in/ac/gujaratuniversity.txt b/lib/domains/in/ac/gujaratuniversity.txt
new file mode 100644
index 0000000000..425069b1b6
--- /dev/null
+++ b/lib/domains/in/ac/gujaratuniversity.txt
@@ -0,0 +1 @@
+Gujarat University
\ No newline at end of file
diff --git a/lib/domains/in/ac/ietlucknow.txt b/lib/domains/in/ac/ietlucknow.txt
new file mode 100644
index 0000000000..f0468e21b1
--- /dev/null
+++ b/lib/domains/in/ac/ietlucknow.txt
@@ -0,0 +1,2 @@
+Institute of Engineering and Technology, Lucknow
+Institute of Engineering and Technology, Lucknow
\ No newline at end of file
diff --git a/lib/domains/in/ac/iiitn.txt b/lib/domains/in/ac/iiitn.txt
new file mode 100644
index 0000000000..5cee01ffa5
--- /dev/null
+++ b/lib/domains/in/ac/iiitn.txt
@@ -0,0 +1 @@
+Indian Institute of Information Technology, Nagpur
\ No newline at end of file
diff --git a/lib/domains/in/ac/iisertvm.txt b/lib/domains/in/ac/iisertvm.txt
new file mode 100644
index 0000000000..30d0e8c0d3
--- /dev/null
+++ b/lib/domains/in/ac/iisertvm.txt
@@ -0,0 +1 @@
+Indian Institute of Science Education and Research Thiruvananthapuram (IISER TVM)
\ No newline at end of file
diff --git a/lib/domains/in/ac/iitdh.txt b/lib/domains/in/ac/iitdh.txt
new file mode 100644
index 0000000000..e86c3fcdec
--- /dev/null
+++ b/lib/domains/in/ac/iitdh.txt
@@ -0,0 +1 @@
+Indian Institute of Technology Dharwad
\ No newline at end of file
diff --git a/lib/domains/in/ac/jntuh/cej.txt b/lib/domains/in/ac/jntuh/cej.txt
new file mode 100644
index 0000000000..bc78fdcab1
--- /dev/null
+++ b/lib/domains/in/ac/jntuh/cej.txt
@@ -0,0 +1 @@
+Jawaharlal Nehru Technological University Hyderabad
diff --git a/lib/domains/in/ac/keck.txt b/lib/domains/in/ac/keck.txt
new file mode 100644
index 0000000000..1856185a21
--- /dev/null
+++ b/lib/domains/in/ac/keck.txt
@@ -0,0 +1 @@
+Katihar Engineering College, katihar
\ No newline at end of file
diff --git a/lib/domains/in/ac/kpcoll.txt b/lib/domains/in/ac/kpcoll.txt
new file mode 100644
index 0000000000..52d6604c75
--- /dev/null
+++ b/lib/domains/in/ac/kpcoll.txt
@@ -0,0 +1,2 @@
+Kanchrapara College
+Kanchrapara College
\ No newline at end of file
diff --git a/lib/domains/in/ac/nitmanipur.txt b/lib/domains/in/ac/nitmanipur.txt
new file mode 100644
index 0000000000..59a73ae5d9
--- /dev/null
+++ b/lib/domains/in/ac/nitmanipur.txt
@@ -0,0 +1 @@
+National Institute of Technology Manipur
\ No newline at end of file
diff --git a/lib/domains/in/ac/nits/ee.txt b/lib/domains/in/ac/nits/ee.txt
new file mode 100644
index 0000000000..21b623ada8
--- /dev/null
+++ b/lib/domains/in/ac/nits/ee.txt
@@ -0,0 +1 @@
+National Institute of Technology Silchar
\ No newline at end of file
diff --git a/lib/domains/in/ac/pdpu/sls.txt b/lib/domains/in/ac/pdpu/sls.txt
new file mode 100644
index 0000000000..9fc33b18ee
--- /dev/null
+++ b/lib/domains/in/ac/pdpu/sls.txt
@@ -0,0 +1 @@
+Pandit Deendayal Energy University - School of Liberal Studies
\ No newline at end of file
diff --git a/lib/domains/in/ac/sharda/ug.txt b/lib/domains/in/ac/sharda/ug.txt
new file mode 100644
index 0000000000..c9ad13c709
--- /dev/null
+++ b/lib/domains/in/ac/sharda/ug.txt
@@ -0,0 +1 @@
+Sharda University
\ No newline at end of file
diff --git a/lib/domains/in/ac/srmcem.txt b/lib/domains/in/ac/srmcem.txt
new file mode 100644
index 0000000000..850cb7c65d
--- /dev/null
+++ b/lib/domains/in/ac/srmcem.txt
@@ -0,0 +1,2 @@
+Shri Ramswaroop Memorial College of Engineering and Management, Lucknow
+Shri Ramswaroop Memorial College of Engineering and Management, Lucknow
\ No newline at end of file
diff --git a/lib/domains/in/ac/ssmiet.txt b/lib/domains/in/ac/ssmiet.txt
new file mode 100644
index 0000000000..b2aefa8c44
--- /dev/null
+++ b/lib/domains/in/ac/ssmiet.txt
@@ -0,0 +1 @@
+SSM INSTITUTE OF ENGINEERING AND TECHNOLOGY, DINDIGUL
\ No newline at end of file
diff --git a/lib/domains/in/ac/tiss.txt b/lib/domains/in/ac/tiss.txt
new file mode 100644
index 0000000000..8dcc5063da
--- /dev/null
+++ b/lib/domains/in/ac/tiss.txt
@@ -0,0 +1 @@
+Tata Institute of Social Sciences, Mumbai.
diff --git a/lib/domains/in/co/niet.txt b/lib/domains/in/co/niet.txt
deleted file mode 100644
index 56da1685db..0000000000
--- a/lib/domains/in/co/niet.txt
+++ /dev/null
@@ -1 +0,0 @@
-Noida Institute of Engineering and Technology
\ No newline at end of file
diff --git a/lib/domains/in/svims.txt b/lib/domains/in/svims.txt
new file mode 100644
index 0000000000..8c1dac7278
--- /dev/null
+++ b/lib/domains/in/svims.txt
@@ -0,0 +1 @@
+Swami Vivekananda Institute of Modern Science
diff --git a/lib/domains/it/edu/convittonovara.txt b/lib/domains/it/edu/convittonovara.txt
new file mode 100644
index 0000000000..27782330eb
--- /dev/null
+++ b/lib/domains/it/edu/convittonovara.txt
@@ -0,0 +1 @@
+Liceo Scientifico "Carlo Alberto"
\ No newline at end of file
diff --git a/lib/domains/it/edu/iisfalcone-righi/studenti.txt b/lib/domains/it/edu/iisfalcone-righi/studenti.txt
index 6217d5f2f3..2e1fcf35e7 100644
--- a/lib/domains/it/edu/iisfalcone-righi/studenti.txt
+++ b/lib/domains/it/edu/iisfalcone-righi/studenti.txt
@@ -1 +1 @@
-IIS Falcone Righi 
\ No newline at end of file
+Istituto d'Istruzione Superiore Falcone Righi, Corsico (MI) Italy
diff --git a/lib/domains/it/edu/istitutopertiniafragola.txt b/lib/domains/it/edu/istitutopertiniafragola.txt
new file mode 100644
index 0000000000..847e381ebe
--- /dev/null
+++ b/lib/domains/it/edu/istitutopertiniafragola.txt
@@ -0,0 +1,3 @@
+Istituto Sandro Pertini, Afragola
+I.S. "S. Pertini"
+I.S.I.S. "S. Pertini"
\ No newline at end of file
diff --git a/lib/domains/kr/ac/bu.txt b/lib/domains/kr/ac/bu.txt
deleted file mode 100644
index 26c7a70240..0000000000
--- a/lib/domains/kr/ac/bu.txt
+++ /dev/null
@@ -1 +0,0 @@
-백석대학교
\ No newline at end of file
diff --git a/lib/domains/kr/ac/knsu.txt b/lib/domains/kr/ac/knsu.txt
new file mode 100644
index 0000000000..ec143acb13
--- /dev/null
+++ b/lib/domains/kr/ac/knsu.txt
@@ -0,0 +1,2 @@
+한국체육대학교
+Korea National Sport University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/kpu.txt b/lib/domains/kr/ac/kpu.txt
deleted file mode 100644
index 451feead12..0000000000
--- a/lib/domains/kr/ac/kpu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Korea Polytechnic University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/yu.txt b/lib/domains/kr/ac/yu.txt
deleted file mode 100644
index 145224c502..0000000000
--- a/lib/domains/kr/ac/yu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-영남대학교
-Yeungnam University
diff --git a/lib/domains/kr/duksung.txt b/lib/domains/kr/duksung.txt
deleted file mode 100644
index 887a333f1f..0000000000
--- a/lib/domains/kr/duksung.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-덕성여자대학교
-Duksung Women's University
diff --git a/lib/domains/kr/hs/hansei.txt b/lib/domains/kr/hs/hansei.txt
new file mode 100644
index 0000000000..1997ea5575
--- /dev/null
+++ b/lib/domains/kr/hs/hansei.txt
@@ -0,0 +1 @@
+Hansei Cyber Security High School
\ No newline at end of file
diff --git a/lib/domains/kr/jnu.txt b/lib/domains/kr/jnu.txt
new file mode 100644
index 0000000000..a53e97090b
--- /dev/null
+++ b/lib/domains/kr/jnu.txt
@@ -0,0 +1 @@
+Chonnam National University
\ No newline at end of file
diff --git a/lib/domains/kz/wjfs.txt b/lib/domains/kz/wjfs.txt
new file mode 100644
index 0000000000..7f5643fd3e
--- /dev/null
+++ b/lib/domains/kz/wjfs.txt
@@ -0,0 +1 @@
+West Kazakhstan Juridical Fintech School
diff --git a/lib/domains/lb/edu/ic.txt b/lib/domains/lb/edu/ic.txt
new file mode 100644
index 0000000000..0fb6e49e5e
--- /dev/null
+++ b/lib/domains/lb/edu/ic.txt
@@ -0,0 +1 @@
+International College Beirut, Lebanon
diff --git a/lib/domains/lk/ac/nsbm.txt b/lib/domains/lk/ac/nsbm.txt
deleted file mode 100644
index 7316b1bdbb..0000000000
--- a/lib/domains/lk/ac/nsbm.txt
+++ /dev/null
@@ -1 +0,0 @@
-NSBM Green University
\ No newline at end of file
diff --git a/lib/domains/lv/id/gmbh/xtv.txt b/lib/domains/lv/id/gmbh/xtv.txt
deleted file mode 100644
index 5314fe9632..0000000000
--- a/lib/domains/lv/id/gmbh/xtv.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Jelgava X Tālmācības Vidusskola
-Jelgava No.10 High school
\ No newline at end of file
diff --git a/lib/domains/lv/id/iu.txt b/lib/domains/lv/id/iu.txt
deleted file mode 100644
index 6ddd12dfbb..0000000000
--- a/lib/domains/lv/id/iu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Latvija Inovatīvā Universitāte
-Latvija Innovative University
\ No newline at end of file
diff --git a/lib/domains/lv/id/kingman.txt b/lib/domains/lv/id/kingman.txt
deleted file mode 100644
index 3ce087be5d..0000000000
--- a/lib/domains/lv/id/kingman.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Latvija Kingmana universitāte
-Latvia Kingman University
\ No newline at end of file
diff --git a/lib/domains/ma/ac/enset-media.txt b/lib/domains/ma/ac/enset-media.txt
new file mode 100644
index 0000000000..4643bf184f
--- /dev/null
+++ b/lib/domains/ma/ac/enset-media.txt
@@ -0,0 +1 @@
+Ecole Normale Supérieure de l'Enseignement Technique Mohammedia
\ No newline at end of file
diff --git a/lib/domains/ma/uca.txt b/lib/domains/ma/uca.txt
index 97a891fdc5..bb925882d8 100644
--- a/lib/domains/ma/uca.txt
+++ b/lib/domains/ma/uca.txt
@@ -1 +1 @@
-Université Cadi Ayyad
+Université Cadi Ayyad
\ No newline at end of file
diff --git a/lib/domains/mx/edu/tesjo.txt b/lib/domains/mx/edu/tesjo.txt
deleted file mode 100644
index cea61ac1d0..0000000000
--- a/lib/domains/mx/edu/tesjo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tecnológico de Estudios Superiores de Jocotitlán
\ No newline at end of file
diff --git a/lib/domains/mx/edu/uptecamac.txt b/lib/domains/mx/edu/uptecamac.txt
deleted file mode 100644
index b7d4d5a00d..0000000000
--- a/lib/domains/mx/edu/uptecamac.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Universidad Politécnica de Tecámac
-Tecámac Polytechnic University
\ No newline at end of file
diff --git a/lib/domains/mx/edu/upz.txt b/lib/domains/mx/edu/upz.txt
new file mode 100644
index 0000000000..4c51df730f
--- /dev/null
+++ b/lib/domains/mx/edu/upz.txt
@@ -0,0 +1 @@
+Universidad Politecnica de Zacatecas
diff --git a/lib/domains/my/edu/upm.txt b/lib/domains/my/edu/upm.txt
deleted file mode 100644
index 9bfa99b832..0000000000
--- a/lib/domains/my/edu/upm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universiti Putra Malaysia
diff --git a/lib/domains/nl/gymnasiumhilversum.txt b/lib/domains/nl/gymnasiumhilversum.txt
index 3185c4758a..74e365a8d1 100644
--- a/lib/domains/nl/gymnasiumhilversum.txt
+++ b/lib/domains/nl/gymnasiumhilversum.txt
@@ -1 +1,2 @@
-Gemeentelijk Gymnasium Hilversum
+Gemeentelijk Gymnasium Hilversum
+.group
\ No newline at end of file
diff --git a/lib/domains/np/edu/chitwancollege.txt b/lib/domains/np/edu/chitwancollege.txt
new file mode 100644
index 0000000000..75aba47d0e
--- /dev/null
+++ b/lib/domains/np/edu/chitwancollege.txt
@@ -0,0 +1 @@
+Chitwan College of Technology
\ No newline at end of file
diff --git a/lib/domains/np/edu/ith.txt b/lib/domains/np/edu/ith.txt
new file mode 100644
index 0000000000..f1e939fb54
--- /dev/null
+++ b/lib/domains/np/edu/ith.txt
@@ -0,0 +1 @@
+Impact Tech School
\ No newline at end of file
diff --git a/lib/domains/np/edu/oxfordcollege.txt b/lib/domains/np/edu/oxfordcollege.txt
deleted file mode 100644
index 26e9fb94c7..0000000000
--- a/lib/domains/np/edu/oxfordcollege.txt
+++ /dev/null
@@ -1 +0,0 @@
-Oxford College of Engineering and Management
\ No newline at end of file
diff --git a/lib/domains/org/akesu.txt b/lib/domains/org/akesu.txt
new file mode 100644
index 0000000000..cd36a4f488
--- /dev/null
+++ b/lib/domains/org/akesu.txt
@@ -0,0 +1 @@
+Aga Khan High School
diff --git a/lib/domains/org/alsalamprivateschool.txt b/lib/domains/org/alsalamprivateschool.txt
new file mode 100644
index 0000000000..5d301d3183
--- /dev/null
+++ b/lib/domains/org/alsalamprivateschool.txt
@@ -0,0 +1 @@
+Al Salam Community School
\ No newline at end of file
diff --git a/lib/domains/org/csd99.txt b/lib/domains/org/csd99.txt
new file mode 100644
index 0000000000..cf4d1256c9
--- /dev/null
+++ b/lib/domains/org/csd99.txt
@@ -0,0 +1 @@
+Downers Grove North Highschool
\ No newline at end of file
diff --git a/lib/domains/org/etsc.txt b/lib/domains/org/etsc.txt
new file mode 100644
index 0000000000..0990d72fcf
--- /dev/null
+++ b/lib/domains/org/etsc.txt
@@ -0,0 +1,2 @@
+Evanglical Theological Seminary in Cairo
+Evanglical Theological Seminary in Cairo
diff --git a/lib/domains/org/friendsseminary.txt b/lib/domains/org/friendsseminary.txt
new file mode 100644
index 0000000000..256002f1b7
--- /dev/null
+++ b/lib/domains/org/friendsseminary.txt
@@ -0,0 +1 @@
+Friends Seminary
diff --git a/lib/domains/org/gujaratvidyapith.txt b/lib/domains/org/gujaratvidyapith.txt
new file mode 100644
index 0000000000..093e2d8a26
--- /dev/null
+++ b/lib/domains/org/gujaratvidyapith.txt
@@ -0,0 +1,2 @@
+GUJARAT VIDYAPITH AHEMDABAD
+GUJARAT VIDYAPITH AHEMDABAD
\ No newline at end of file
diff --git a/lib/domains/org/lwshanghai.txt b/lib/domains/org/lwshanghai.txt
new file mode 100644
index 0000000000..8bc4c31157
--- /dev/null
+++ b/lib/domains/org/lwshanghai.txt
@@ -0,0 +1,2 @@
+上海闵行区美高教育培训学校
+Living Word Shanghai
\ No newline at end of file
diff --git a/lib/domains/pe/edu/unfv.txt b/lib/domains/pe/edu/unfv.txt
deleted file mode 100644
index 5a272da38f..0000000000
--- a/lib/domains/pe/edu/unfv.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Universidad Nacional Federico Villarreal
-Universidad Nacional Federico Villarreal
\ No newline at end of file
diff --git a/lib/domains/pl/2slo.txt b/lib/domains/pl/2slo.txt
new file mode 100644
index 0000000000..401e7cdfae
--- /dev/null
+++ b/lib/domains/pl/2slo.txt
@@ -0,0 +1,2 @@
+2 Społeczne Liceum Ogólnokształcące STO
+2nd SLO Jasienica High School
\ No newline at end of file
diff --git a/lib/domains/pl/edu/pansjar/s.txt b/lib/domains/pl/edu/pansjar/s.txt
new file mode 100644
index 0000000000..0b6e3837dc
--- /dev/null
+++ b/lib/domains/pl/edu/pansjar/s.txt
@@ -0,0 +1,2 @@
+Państwowa Akademia Nauk Stosowanych im. ks. Bronisława Markiewicza w Jarosławiu
+National Academy of Applied Sciences in Jarosław
\ No newline at end of file
diff --git a/lib/domains/pl/edu/zsh.txt b/lib/domains/pl/edu/zsh.txt
new file mode 100644
index 0000000000..0ca3dd75e5
--- /dev/null
+++ b/lib/domains/pl/edu/zsh.txt
@@ -0,0 +1,2 @@
+Zespół Szkół Handlowych im. Bohaterów Poznańskiego Czerwca '56 w Poznaniu
+Trade School Complex of the Heroes of Poznań June '56
diff --git a/lib/domains/rs/edu/xku.txt b/lib/domains/rs/edu/xku.txt
new file mode 100644
index 0000000000..51e8004310
--- /dev/null
+++ b/lib/domains/rs/edu/xku.txt
@@ -0,0 +1,2 @@
+Универзитет науке и технологије Србије
+Serbia University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/sg/edu/mdis.txt b/lib/domains/sg/edu/mdis.txt
deleted file mode 100644
index 1287e2bd11..0000000000
--- a/lib/domains/sg/edu/mdis.txt
+++ /dev/null
@@ -1 +0,0 @@
-Management Development Institute of Singapore (MDIS)
diff --git a/lib/domains/stoplist.txt b/lib/domains/stoplist.txt
index 76875672aa..b6f242ed06 100644
--- a/lib/domains/stoplist.txt
+++ b/lib/domains/stoplist.txt
@@ -643,4 +643,22 @@ alumni.ncu.edu.tw
 smkmuhkarangmojo.com
 aimu.edu.kg
 poornima.ac.in
-mail.centroeducativoinvironda.edu.do
\ No newline at end of file
+mail.centroeducativoinvironda.edu.do
+theflightsims.edu.pl
+stu.biticrak.ae
+hut.edu.pa
+jasukg.me
+kbtu.me
+osdri.me
+cedara.ac.za
+campus-numerique-in-the-alps.com
+escoladotrabalhador40.com.br
+chosun-g.gen.hs.kr
+aryacs.edu.in
+hs.taquangbuu-bk.edu.vn
+aue.ae
+cug.ac.in
+live.hcu.ac.th
+outlook.up.edu.ph
+dongeui.ms.kr
+duksung.kr
\ No newline at end of file
diff --git a/lib/domains/th/ac/kmitl.txt b/lib/domains/th/ac/kmitl.txt
deleted file mode 100644
index 1cf15087f6..0000000000
--- a/lib/domains/th/ac/kmitl.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-สถาบันเทคโนโลยีพระจอมเกล้าเจ้าคุณทหารลาดกระบัง
-King Mongkut's Institute of Technology Ladkrabang
\ No newline at end of file
diff --git a/lib/domains/tlds.txt b/lib/domains/tlds.txt
index bd9e137bb5..a97d277df5 100644
--- a/lib/domains/tlds.txt
+++ b/lib/domains/tlds.txt
@@ -1,16 +1,13 @@
-ac.bd
 ac.be
 ac.gg
 ac.gn
 ac.il
 ac.jp
 ac.me
-ac.mw
 ac.ni
 ac.om
 ac.pg
 ac.pr
-ac.ru
 ac.rw
 ac.sz
 ac.yu
diff --git a/lib/domains/tn/ucar/fsegn.txt b/lib/domains/tn/ucar/fsegn.txt
index 1160e679f9..dc98fa2460 100644
--- a/lib/domains/tn/ucar/fsegn.txt
+++ b/lib/domains/tn/ucar/fsegn.txt
@@ -1,2 +1,2 @@
 Faculté des Sciences Economiques et de Gestion de Nabeul, Université de carthage Tunisie
-Faculty of Economics and Management of Nabeul, University of Carthage Tunisia
+Faculty of Economics and Management of Nabeul, University of Carthage Tunisia
\ No newline at end of file
diff --git a/lib/domains/tr/edu/msgsu.txt b/lib/domains/tr/edu/msgsu.txt
deleted file mode 100644
index bd7a28aaaf..0000000000
--- a/lib/domains/tr/edu/msgsu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-T.C. Mimar Sinan Güzel Sanatlar Üniversitesi
-T.C. Mimar Sinan Fine Arts University
\ No newline at end of file
diff --git a/lib/domains/tw/yphs.txt b/lib/domains/tw/yphs.txt
new file mode 100644
index 0000000000..a729987b3b
--- /dev/null
+++ b/lib/domains/tw/yphs.txt
@@ -0,0 +1,2 @@
+新北市立永平高級中學
+New Taipei Municipal Yongping Senior High School
\ No newline at end of file
diff --git a/lib/domains/uk/co/stbarts.txt b/lib/domains/uk/co/stbarts.txt
new file mode 100644
index 0000000000..3a3cb3edec
--- /dev/null
+++ b/lib/domains/uk/co/stbarts.txt
@@ -0,0 +1 @@
+St Bartholomew’s School
\ No newline at end of file
diff --git a/lib/domains/uz/aut-edu.txt b/lib/domains/uz/aut-edu.txt
new file mode 100644
index 0000000000..edb6ac6130
--- /dev/null
+++ b/lib/domains/uz/aut-edu.txt
@@ -0,0 +1 @@
+American University of Technology, Uzbekistan
\ No newline at end of file
diff --git a/lib/domains/vn/edu/bachkhoahanoi.txt b/lib/domains/vn/edu/bachkhoahanoi.txt
deleted file mode 100644
index fca6ce9e8c..0000000000
--- a/lib/domains/vn/edu/bachkhoahanoi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-cao đẳng công nghệ bách khoa hà nội
-hanoi polytechnic college of technology
\ No newline at end of file
diff --git a/lib/domains/vn/edu/dav.txt b/lib/domains/vn/edu/dav.txt
deleted file mode 100644
index 0dc01c75ad..0000000000
--- a/lib/domains/vn/edu/dav.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Hoc Viet Ngoai Giao Viet Nam
-Diplomatic Academy of Vietnam
diff --git a/lib/domains/vn/edu/hcmiu.txt b/lib/domains/vn/edu/hcmiu.txt
deleted file mode 100644
index 97dbe36174..0000000000
--- a/lib/domains/vn/edu/hcmiu.txt
+++ /dev/null
@@ -1 +0,0 @@
-International University Ho Chi Minh City
diff --git a/lib/domains/vn/edu/ntthnue.txt b/lib/domains/vn/edu/ntthnue.txt
deleted file mode 100644
index af22b95c91..0000000000
--- a/lib/domains/vn/edu/ntthnue.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Nguyen Tat Thanh high school
-Nguyen Tat Thanh high school
\ No newline at end of file