diff --git a/fingerprints_http.csv b/fingerprints_http.csv
index 6bef498..e82baa6 100644
--- a/fingerprints_http.csv
+++ b/fingerprints_http.csv
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
name,scope,other_names,location_found,pattern_type,pattern,confidence_no_fp,expected_countries,source,exp_url,notes
ooni.ae_0,nat,ooni.sa_1,header.server,prefix,Protected by WireFilter,5,"AE,SA",ooni,,
ooni.ae_1,nat,,header.location,prefix,http://www.bluecoat.com/notify-NotifyUser1,5,AE,ooni,,
@@ -1739,1741 +1738,3 @@ ooni.hk_http_1,vbw,,body,contains,"
One moment, please...",5,HK,si
ooni.id_kominfo,nat,,body,contains,aduankonten@kominfo.go.id,10,ID,sinarproject,https://explorer.ooni.org/measurement/20240328T115128Z_webconnectivity_ID_138089_n1_PQrqL6BfAmnkDwiu?input=http://infopapua.org/,
ooni.th_mdes,nat,,body,contains,mdes.jpg,10,TH,sinarproject,https://explorer.ooni.org/measurement/20230913T182925Z_webconnectivity_TH_17552_n1_oyj46PvHHphoEy0N?input=http://en.wikipedia.org/wiki/Bhumibol_Adulyadej,
ooni.in_airtel,nat,,body,contains,http://www.airtel.in/court-orders/,10,IN,sinarproject,https://explorer.ooni.org/m/20240401004715.467243_IN_webconnectivity_b94ac34767a8e129,
-=======
-name,scope,other_names,location_found,pattern_type,pattern,confidence_no_fp,expected_countries,source,exp_url,notes
-ooni.ae_0,nat,ooni.sa_1,header.server,prefix,Protected by WireFilter,5,"AE,SA",ooni,,
-ooni.ae_1,nat,,header.location,prefix,http://www.bluecoat.com/notify-NotifyUser1,5,AE,ooni,,
-ooni.ae_2,isp,,header.location,prefix,http://lighthouse.du.ae,5,AE,ooni,,
-ooni.ae_3,isp,cl.inst_corp_etisalat,body,contains,it-security-operations@etisalat.ae,5,AE,ooni,https://explorer.ooni.org/measurement/20190708T075453Z_AS5384_VXPZQorUMS5VJxSy4BWbzITW3GGfQOWX9APTD9wBEJDCCDU4s5?input=http://gaytoday.com/,Blockpage text seen in the Etisalat corporate blockpage which is a customized Websense
-ooni.af_0,isp,,body,contains,"content=""Access Denied - Afghan Wireless Communication Company",5,AF,ooni,,
-ooni.ar_0,isp,,body,contains,Notificación: política: filtrado de URL,5,AR,ooni,,
-ooni.au_0,inst,"ooni.de_0,ooni.dk_1,ooni.fr_1",body,contains,Notification: Policy: URL Filtering,5,"AU,DE,DK,FR",ooni,,
-ooni.au_1,isp,,header.location,prefix,https://go.telstra.com.au/broadbandprotect/networkprotectionstandard,5,AU,ooni,,
-ooni.au_2,isp,cl.prod_contentkeeper,body,contains,Blocked by ContentKeeper,5,"AU,IL",ooni,https://explorer.ooni.org/measurement/20190727T072541Z_AS132909_MpSZSKk7KLUGwYzXlP6Q1BTllFuPXmFxAZjvUyZrOYjJa6RlVD?input=http://gaytoday.com/,Blocking service used in schools
-ooni.be_0,nat,,body,contains,that is considered illegal according to Belgian legislation,5,BE,ooni,,
-ooni.be_1,inst,,header.via,full,1.1 webfilter.stjohns.net (http_scan_byf/3.5.16),5,BE,ooni,,
-ooni.br_0,inst,,header.via,full,1.1 wsa07.grupoamil.com.br:80 (Cisco-WSA/9.1.2-010),5,BR,ooni,,
-ooni.br_1,inst,,header.server,full,SonicWALL,5,BR,ooni,,
-ooni.bh_0,isp,cl.isp_bh_batelco_block_forward,body,contains,www.anonymous.com.bh,5,BH,ooni,https://explorer.ooni.org/measurement/20200103T214930Z_AS5416_Cb0eigi9DgBdD9lrQfZLTSckVYANzKDOzI5LSd9yPbFcJNEUuT?input=http://www.gay.com/,BH ISP Batelco Netsweeper Blockpage via anonymous.com.bh
-ooni.bh_1,isp,cl.isp_bh_viva_block_forward,body,contains,www.viva.com.bh/static/block,5,BH,ooni,https://explorer.ooni.org/measurement/20180821T225240Z_AS51375_arIbEdkOsq47wsCE8tRpJWQuIeDN8adphRYo1e76drI3rZWRWr?input=http://gaytoday.com,BH ISP VIVA Blockpage via http://www.viva.com.bh/static/block
-ooni.bh_2,isp,cl.isp_bh_mena_telecom_block_forward,body,contains,menatelecom.com/deny_page.html,5,BH,ooni,https://explorer.ooni.org/measurement/20170220T113603Z_AS39015_Lamk4jT9RlMfeIjwMbg4oi8xBU67dBgnWwzD7Nb4UhihIaR0Ap?input=http://gaytoday.com,BH ISP MENA Telecom Blockpage via http://www.viva.com.bh/static/block
-ooni.by_0,isp,,header.location,prefix,https://www.a1.by/mininfo/,5,BY,ooni,,
-ooni.by_1,isp,,header.location,prefix,http://82.209.230.23,5,BY,ooni,,
-ooni.by_2,isp,,header.location,prefix,https://internet.mts.by/blocked/,5,BY,ooni,,
-ooni.by_3,nat,ooni.ru_80,header.location,prefix,https://vk.com/blank.php?rkn=,5,"BY,RU",ooni,,
-ooni.ca_0,inst,,body,contains, Notification: Policy: URL Filtering,5,CA,ooni,,
-ooni.ca_1,isp,cl.isp_ca_shaw_block,body,contains,Access to this site has been blocked by an Order issued by the Federal Court of Canada,5,CA,ooni,https://explorer.ooni.org/measurement/20220203T170239Z_webconnectivity_CA_6327_n1_3Qts0KFGq9BAcnb1?input=http%3A%2F%2Fdestv.me%2F,CA ISP Shaw Block Page for Court Order
-ooni.ca_2,isp,cl.isp_ca_rogers_tva_telus_block,body,contains,Access to the location you have attempted to reach has been disabled pursuant to an Order of the Federal Court (Canada),5,CA,ooni,https://explorer.ooni.org/measurement/20220203T103332Z_webconnectivity_CA_812_n1_7M7ZYtu8kInk4dU3?input=http%3A%2F%2Fapp.atntvv.cc%2F,CA ISP Rogers Telus and TVA Group joint Block Page
-ooni.ch_0,inst,,header.location,prefix,https://192.168.88.1/sgerror.php,5,CH,ooni,,
-ooni.cl_0,inst,,header.server,full,Kerio Control Embedded Web Server,5,CL,ooni,,
-ooni.co_0,nat,,body,contains,"Esta página ha sido bloqueada por disposición del Ministerio de las TIC,",5,CO,ooni,,
-ooni.cy_0,nat,,body,contains,nba.com.cy/Eas/eas.nsf/All/6F7F17A7790A55C8C2257B130055C86F,5,CY,ooni,,
-ooni.de_1,isp,,header.x-app-url,full,https://blocked.netalerts.io,5,DE,ooni,,
-ooni.de_2,inst,cl.prod_iserv_blockpage,body,contains,title>IServ,5,DE,ooni,https://explorer.ooni.org/measurement/20191129T093025Z_AS31334_QLJPBWGVj5ZqNmPb7C3R4KQkEatrbGCQu9nVQQwgkNH4SnWxpZ?input=http://www.newnownext.com/,Web filtering product focused on German schools
-ooni.de_3,isp,,header.location,prefix,https://hotspot.vodafone.de/access_denied.html,5,DE,ooni,,
-ooni.dk_0,nat,,body,contains,lagt at blokere for adgang til siden.,5,DK,ooni,,
-ooni.eg_0,isp,,header.location,prefix,http://notification.etisalat.com.eg/etisalat/notification/redirectionactions.html?,5,EG,ooni,,
-ooni.es_0,vbw,,body,contains,Dominio-No-Disponible,5,ES,ooni,,
-ooni.es_1,inst,"ooni.it_1,ooni.mx_0,ooni.pk_0",header.server,full,V2R2C00-IAE/1.0,5,"ES,IT,MX,PK",ooni,,
-ooni.fr_0,nat,ooni.gf_0,body,contains,"xtpage = ""page-blocage-terrorisme""",5,"FR,GF",ooni,,
-ooni.fr_2,inst,cl.prod_olfeo,header.server,prefix,Olfeo,5,FR,ooni,https://explorer.ooni.org/measurement/20181013T160011Z_AS3215_IRIYlWDvBY8FTKrWmI3C6GrvGXVEeHwibS9J9AeorEPZbKp62j?input=http://gaytoday.com,French Web Filtering/Secure Gateway product makes itself generally known in headers
-ooni.gb_0,isp,,header.location,prefix,http://assets.o2.co.uk/18plusaccess/,5,GB,ooni,,
-ooni.gb_1,isp,,header.location,prefix,http://www.vodafone.co.uk/restricted-content,5,GB,ooni,,
-ooni.gb_2,isp,,header.location,prefix,https://www.giffgaff.com/mobile/over18,5,GB,ooni,,
-ooni.gb_3,isp,,header.location,prefix,http://block.cf.sky.com,5,GB,ooni,,
-ooni.gb_4,inst,cl.inst_edu_taunton,body,contains,Taunton School allow access to the following search engines,5,GB,ooni,https://explorer.ooni.org/measurement/20190523T171133Z_AS12513_H6Wc12khwbndgeJ9oKath0nvUZ4IeEcmNSCxmcTpYPe59MdSpV?input=http://www.grindr.com/,Blockpage text seen in a preparatory school in South West England
-ooni.gb_5,isp,,header.location,prefix,http://blocked.nb.sky.com,5,GB,ooni,,
-ooni.gb_6,isp,,header.location,full,http://ee.co.uk/help/my-account/corporate-content-lock,5,GB,ooni,,
-ooni.gb_7,isp,,header.location,prefix,http://Filter7external.schoolsbroadband.co.uk/access,5,GB,ooni,,
-ooni.gb_8,isp,,header.location,prefix,https://account.nowtv.com/broadband-buddy/blocked-pages/,5,GB,ooni,,
-ooni.gb_9,isp,,header.location,full,www.vodafone.co.uk/contentcontrolpage/vfb-category-blocklist.html,5,GB,ooni,,
-ooni.gb_10,isp,,header.location,full,http://three.co.uk/mobilebroadband_restricted,5,GB,ooni,,
-ooni.gb_11,isp,,body,contains,"Age Validation",5,GB,ooni,,
-ooni.gr_0,nat,,body,contains,www.gamingcommission.gov.gr/index.php/forbidden-access-black-list/,5,GR,ooni,,
-ooni.gr_1,isp,ooni.zz_0,header.location,prefix,http://1.2.3.50/ups/no_access,5,"GR,ZZ",ooni,,
-ooni.hu_0,inst,,body,contains,Oops! Website blocked!,5,HU,ooni,,
-ooni.hu_1,inst,cp.f_gen_web_blocked,body,contains,Web Page Blocked,5,HU,ooni,,
-ooni.id_0,nat,,header.location,prefix,http://internet-positif.org,5,ID,ooni,,
-ooni.id_1,nat,,header.location,prefix,http://internetpositif.uzone.id,5,ID,ooni,,
-ooni.id_2,nat,,header.location,prefix,http://mercusuar.uzone.id/,5,ID,ooni,,
-ooni.id_3,nat,cl.nat_id_trustpositif_block_1,body,contains,http://block.uzone.id,5,ID,ooni,https://explorer.ooni.org/measurement/20200213T053902Z_AS17974_igK3SmCYSdqnVjV2OxZ1VCUnsaECgo8Dh7S6CfU0AQgWg5nPQU?input=http://www.queernet.org/,Trust/Internet Positif is a DNS blacklist distributed by the Telecom regulator in Indonesia as a part of the Internet Sehat program
-ooni.id_4,nat,cl.nat_id_trustpositif_block_2,body,contains,.uzone.id/assets/internetpositif,5,ID,ooni,https://explorer.ooni.org/measurement/20170414T032645Z_AS17974_Qho7Y39z1oG2s1ylGbQvoFuQh8aDDnY2OwhXMVkqmyBPwQjmT5?input=http://www.bglad.com,Trust/Internet Positif is a DNS blacklist distributed by the Telecom regulator in Indonesia as a part of the Internet Sehat program.
-ooni.id_5,nat,cl.nat_id_trustpositif_block_3,body,contains,positif.uzone.id,5,ID,ooni,https://explorer.ooni.org/measurement/20171121T103829Z_AS17974_QgZkCjksBNucHe11XDLxKXIC3MTW32OamXngJCJrLaoouWNoEM?input=http://www.ifge.org,Trust/Internet Positif is a DNS blacklist distributed by the Telecom regulator in Indonesia as a part of the Internet Sehat program.
-ooni.id_6,nat,cl.nat_id_trustpositif_block_5,body,contains,This page is blocked by Negatif Konten,5,ID,ooni,,Indonesian ISP JLM negatif konten block pages
-ooni.id_16,isp,cl.isp_id_starnet_sehat_blockpage,body,contains,StarNet Project - DNS Filter Project.,5,ID,ooni,https://explorer.ooni.org/measurement/20190323T072437Z_AS0_pvl7biYGsLZDaHODVWbZ1PHC3iijtVfwM4a7BmBOd3YCg8705w?input=http://www.tsroadmap.com,Indonesian ISP Starnet forward to the block page.
-ooni.id_17,isp,,header.location,prefix,http://filter.citra.net.id,5,ID,ooni,,
-ooni.id_18,isp,,body,contains,INTERNET SEHAT CITRANET
,5,ID,ooni,,
-ooni.id_19,isp,cl.isp_id_indosatooredo_block_1,body,contains,Indosatooredoo Netsafe,5,ID,ooni,https://explorer.ooni.org/measurement/20200213T135057Z_AS4761_0VqghBlufZfB6k68FBcGkeU9XAUcCmfXguHZJGBJhaQfurl2do?input=http://www.grindr.com/,Indonesian ISP Indosat/Ooredo block page.
-ooni.id_20,isp,"cl.isp_id_indosatooredo_block_2,cp.c_isp_id_indosat",body,contains,Netsafe IndosatM2,5,ID,ooni,https://explorer.ooni.org/measurement/20170403T000118Z_AS4795_ZGyxgVEVzoRMZpL4QlHyPZtmJOwAO26NUv1Op3Vh6fCv7XIAW3?input=http://www.ifge.org,Indonesian ISP Indosat/Ooredo block page. This is a different title to match against compared to the _1 variant.I believe this is before they merged.
-ooni.id_21,isp,cl.isp_id_indosatooredo_block_js_variant,body,contains,http://netsafe.indosatooredoo.com,5,ID,ooni,https://explorer.ooni.org/measurement/20200213T135057Z_AS4761_0VqghBlufZfB6k68FBcGkeU9XAUcCmfXguHZJGBJhaQfurl2do?input=http://www.grindr.com/,Indonesian ISP Indosat/Ooredo block page. This is made to catch the variant of the blockpage which does a JS forward
-ooni.id_22,isp,cl.isp_id_argon_block,body,contains,argon_files/stop.jpg,5,ID,ooni,https://explorer.ooni.org/measurement/20170501T123218Z_AS17974_TQovh9GvtBR3FlRa5IfIH19tSRfiGUgUzEnGoh5sgdLI1m0OgY?input=http://www.ifge.org,Indonesian ISP Argon (Data Centre) Block
-ooni.id_23,isp,cl.isp_id_myrepublic_block,body,contains,https://myrepublic.co.id/internet-sehat/,5,ID,ooni,https://explorer.ooni.org/measurement/20190905T165736Z_AS63859_PeIPMNtOMVuCacZ3pJmR3RySVKbNArcUTaKTPPLgPddZXwN2KC?input=http://www.queernet.org/,Indonesian ISP MyRepublic block page.
-ooni.id_24,isp,cl.isp_id_telkomsel_block_baik_1,body,contains,internetbaik.telkomsel.com/,5,ID,ooni,https://explorer.ooni.org/measurement/20200130T135811Z_AS23693_d5uipVzMCxrQlnNCO4cB3ZxZYk4CyYZWr8ipsdgC8Qzp4K2Bl9?input=http://www.bglad.com/,Indonesian ISP Telkomsel block page.
-ooni.id_25,isp,cl.isp_id_telkomsel_block_baik_2,body,contains,telkomsel|internet sehat|baik|internet baik,5,ID,ooni,https://explorer.ooni.org/measurement/20170316T024318Z_AS23693_CQPxlyILeqGXlHzFqGSCPR6MgtCBfZtbs3h2l37MOyiU77N1xP?input=http://www.bglad.com,Indonesian ISP Telkomsel block page. This is for the variant that does not use internetbaik.telkomsel.com subdomain. Matches based on metacontent
-ooni.id_26,isp,cl.isp_id_xl_block,body,contains,www.xl.co.id/xlblockpage,5,ID,ooni,https://explorer.ooni.org/measurement/20190307T051144Z_AS131472_7RLBdzGBIF3RPC6UcuV9HJAMkysGP4IR9JkfwfhCSXuieZQtAq?input=http://www.tsroadmap.com,Indonesian ISP XL block page.
-ooni.id_27,isp,cl.isp_id_xl_block_2,body,contains,blockpage.xl.co.id,5,ID,ooni,https://explorer.ooni.org/measurement/20170412T174345Z_AS24203_qlNBUtI6cL4DZGjeNWLOQ5puycMYiMol71agNH5Qvg1WmSAWzL?input=http://www.bglad.com,Indonesian ISP XL block page. Sometimes there is a header forward here (see isp_id_xl_forward) but other times the forward is done in the body content as http-equiv refresh
-ooni.id_28,isp,"cl.isp_id_biznet_block,cp.c_isp_id_biznetnetworks_28_satellite",body,contains,www.biznetnetworks.com/safesurf/,5,ID,ooni,https://explorer.ooni.org/measurement/20190727T045744Z_AS17451_kC7sYnleU6DzAOhrgOf4LXXvtois6M4GnEpgvFCcFP0taBcuIU?input=http://www.gayhealth.com/,Indonesian ISP Biznet block page.
-ooni.id_29,isp,cl.isp_id_velo_block,body,contains,VELO Networks :: Internet Sehat dan Aman,5,ID,ooni,https://explorer.ooni.org/measurement/20190905T052510Z_AS24207_I540tCMJL3Wtb3cJ4oOCQaH7Fv44n2rn8kLkMubuSLLipSctue?input=http://www.gayegypt.com/,Indonesian ISP Velo Networks block page.
-ooni.id_30,isp,cl.isp_id_tri_block,body,contains,restricted.tri.co.id/,5,ID,ooni,https://explorer.ooni.org/measurement/20191005T031241Z_AS45727_93jXiGYrI1w8wHNC9FVzF5zuylmtgOToSGsA0mgYubk132ZKuV?input=http://www.nclrights.org/,Indonesian ISP XL block page.
-ooni.id_31,isp,"cl.isp_id_lintasarta_block,cp.c_isp_id_idola_3_satellite",body,contains,IdOLA Lintasarta,5,ID,ooni,https://explorer.ooni.org/measurement/20190605T140849Z_AS4800_bKVUk4pjoLXBQOUdWBLnQOPZfWfDPGCSoURwopRoEj0O4ZjOKG?input=http://www.tsroadmap.com/,Indonesian ISP lintasarta block page Done via dns to domain dnsfilter2.idola.net.id. This appears to be a TrustPositif list based DNS filter but customized to the ISP
-ooni.id_32,inst,cl.inst_edu_id_telkomuniversity_block,body,contains,Internet Sehat Telkom University,5,ID,ooni,https://explorer.ooni.org/measurement/20180315T084438Z_AS133357_LeDGv9wMP20hFNfN2nqsvJxL1vUKOFZ0grMlnMJXACYHkmPLNB?input=http://www.ifge.org,Indonesian University owned by the largest telco. Has a seperate filtering system. This matches the actual blockpage
-ooni.id_33,isp,cp.c_isp_id_myrepublic_redirect_301_3_satellite,header.location,prefix,http://block.myrepublic.co.id,5,ID,ooni,,
-ooni.id_34,isp,cp.c_isp_id_telkomsel_redirect_301_4_satellite,header.location,prefix,https://internetbaik.telkomsel.com/block?,5,ID,ooni,,
-ooni.id_35,isp,,header.location,prefix,https://blockpage.xl.co.id,5,ID,ooni,,
-ooni.id_36,isp,,header.location,prefix,http://restricted.tri.co.id,5,ID,ooni,,
-ooni.id_37,isp,,body,contains,Blocked Page Bina Nusantara Networks,5,ID,ooni,,
-ooni.id_38,nat,cl.nat_id_idnic_block,body,contains,di.og.ofnimok@netnoknauda,5,ID,ooni,https://explorer.ooni.org/measurement/20200130T121354Z_AS18103_6roxhkcpVP4ML3VyjL75G28deYvsJgocbDyeV8Ud6WBHAFTwy4?input=http://www.grindr.com/,Indonesian NIC block. Based on weird localnet email used in the HTML.
-ooni.ie_0,isp,,header.location,prefix,https://m.three.ie/adult-content,5,IE,ooni,,
-ooni.il_0,isp,cl.prod_netspark_familyfilter,body,contains,http://mobile.netsparkmobile.com/?a=block,5,IL,ooni,https://explorer.ooni.org/measurement/20190820T203403Z_AS199391_BKc62QxMlSz5esuRV2hHpMsUArF7fTeaeRAc8eN0Eb2uE4NVtV?input=http://www.ifge.org/,"Family oriented blocking service sold to companies, used by Israeli schools"
-ooni.in_0,nat,,body,contains,The page you have requested has been blocked,5,IN,ooni,,
-ooni.in_1,inst,,header.via,prefix,1.1 ironport1.iitj.ac.in:80 (Cisco-WSA/,5,IN,ooni,,
-ooni.in_2,inst,,header.via,prefix,1.1 ironport2.iitj.ac.in:80 (Cisco-WSA/,5,IN,ooni,,
-ooni.in_3,inst,,header.server,full,GoAhead-Webs,5,IN,ooni,,
-ooni.in_4,isp,cl.isp_in_airtel_block_forward,body,contains,http://www.airtel.in/dot/?dpid=,5,IN,ooni,https://explorer.ooni.org/measurement/20170704T113906Z_AS24560_wfOnnh9CsrttSEJuRH2QRnOhMxICg8j1yVQRMkMd6V54d3qCgS?input=http://www.gayegypt.com,IN ISP Airtel Blockpage forward with Netsweeper device
-ooni.ir_0,nat,,body,contains,"iframe src=""http://10.10",5,IR,ooni,,
-ooni.ir_1,nat,cl.nat_ir_iframe_forward_ipv6,body,contains,"