diff --git a/data/FilterList.json b/data/FilterList.json
index 3d1c32b83..f5b48335b 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -1980,10 +1980,10 @@
     "description": "Blocks Japanese regional advertisements and trackers.",
     "homeUrl": "https://github.com/k2jp/abp-japanese-filters",
     "id": 202,
+    "isDeleted": true,
     "issuesUrl": "https://github.com/k2jp/abp-japanese-filters/issues",
     "licenseId": 4,
     "name": "ABP Japanese Paranoid Filters",
-    "isDeleted": true,
     "publishedDate": "2014-11-24T21:58:10",
     "syntaxId": 3,
     "updatedDate": "2019-04-10T07:31:48",
@@ -1995,10 +1995,10 @@
     "description": "Blocks Japanese regional advertisements and trackers.",
     "homeUrl": "https://github.com/k2jp/abp-japanese-filters",
     "id": 203,
+    "isDeleted": true,
     "issuesUrl": "https://github.com/k2jp/abp-japanese-filters/issues",
     "licenseId": 4,
     "name": "ABP Japanese Filters",
-    "isDeleted": true,
     "publishedDate": "2014-11-24T21:58:10",
     "syntaxId": 3,
     "updatedDate": "2019-04-10T10:10:13",
@@ -2010,10 +2010,10 @@
     "description": "Blocks irritating elements on Japanese regional webpages.",
     "homeUrl": "https://github.com/k2jp/abp-japanese-filters",
     "id": 204,
+    "isDeleted": true,
     "issuesUrl": "https://github.com/k2jp/abp-japanese-filters/issues",
     "licenseId": 4,
     "name": "ABP Japanese Element-hiding Filters",
-    "isDeleted": true,
     "publishedDate": "2014-11-24T21:58:10",
     "syntaxId": 3,
     "updatedDate": "2019-03-03T10:58:48",
@@ -2025,10 +2025,10 @@
     "description": "Blocks Japanese regional social network advertisements and trackers.",
     "homeUrl": "https://github.com/k2jp/abp-japanese-filters",
     "id": 205,
+    "isDeleted": true,
     "issuesUrl": "https://github.com/k2jp/abp-japanese-filters/issues",
     "licenseId": 4,
     "name": "ABP Japanese 3rd Party SNS Filters",
-    "isDeleted": true,
     "publishedDate": "2014-11-24T21:58:10",
     "syntaxId": 3,
     "updatedDate": "2018-10-13T10:40:26",
@@ -23573,7 +23573,7 @@
     "viewUrl": "https://raw.githubusercontent.com/L33Tech/uLists/master/Lists/L33TAIO.uBl"
   },
   {
-  	"description": "Please see https://stopmodreposts.org/. All credit to above site!",
+    "description": "Please see https://stopmodreposts.org/. All credit to above site!",
     "homeUrl": "https://github.com/L33Tech/uLists",
     "id": 2339,
     "issuesUrl": "https://github.com/L33Tech/uLists/issues",
@@ -23581,4 +23581,4 @@
     "syntaxId": 2,
     "viewUrl": "https://raw.githubusercontent.com/L33Tech/uLists/master/Forks/StopModReposts.uBl"
   }
-]
\ No newline at end of file
+]
diff --git a/data/FilterListTag.json b/data/FilterListTag.json
index 632b1c295..2c5707191 100644
--- a/data/FilterListTag.json
+++ b/data/FilterListTag.json
@@ -1299,6 +1299,10 @@
     "filterListId": 245,
     "tagId": 2
   },
+  {
+    "filterListId": 245,
+    "tagId": 41
+  },
   {
     "filterListId": 246,
     "tagId": 2
@@ -1355,6 +1359,10 @@
     "filterListId": 255,
     "tagId": 3
   },
+  {
+    "filterListId": 255,
+    "tagId": 40
+  },
   {
     "filterListId": 256,
     "tagId": 2
@@ -1427,10 +1435,18 @@
     "filterListId": 265,
     "tagId": 3
   },
+  {
+    "filterListId": 265,
+    "tagId": 40
+  },
   {
     "filterListId": 266,
     "tagId": 3
   },
+  {
+    "filterListId": 266,
+    "tagId": 40
+  },
   {
     "filterListId": 267,
     "tagId": 2
@@ -1983,6 +1999,10 @@
     "filterListId": 392,
     "tagId": 16
   },
+  {
+    "filterListId": 392,
+    "tagId": 40
+  },
   {
     "filterListId": 393,
     "tagId": 6
@@ -3227,6 +3247,10 @@
     "filterListId": 764,
     "tagId": 3
   },
+  {
+    "filterListId": 764,
+    "tagId": 40
+  },
   {
     "filterListId": 765,
     "tagId": 2
@@ -3527,6 +3551,10 @@
     "filterListId": 825,
     "tagId": 16
   },
+  {
+    "filterListId": 825,
+    "tagId": 40
+  },
   {
     "filterListId": 826,
     "tagId": 2
@@ -9727,6 +9755,10 @@
     "filterListId": 1957,
     "tagId": 35
   },
+  {
+    "filterListId": 1957,
+    "tagId": 41
+  },
   {
     "filterListId": 1958,
     "tagId": 2
@@ -9739,6 +9771,10 @@
     "filterListId": 1958,
     "tagId": 35
   },
+  {
+    "filterListId": 1958,
+    "tagId": 41
+  },
   {
     "filterListId": 1959,
     "tagId": 12
@@ -9775,6 +9811,10 @@
     "filterListId": 1963,
     "tagId": 35
   },
+  {
+    "filterListId": 1963,
+    "tagId": 41
+  },
   {
     "filterListId": 1964,
     "tagId": 30
@@ -9855,10 +9895,18 @@
     "filterListId": 1979,
     "tagId": 16
   },
+  {
+    "filterListId": 1979,
+    "tagId": 40
+  },
   {
     "filterListId": 1980,
     "tagId": 16
   },
+  {
+    "filterListId": 1980,
+    "tagId": 40
+  },
   {
     "filterListId": 1981,
     "tagId": 30
@@ -10623,6 +10671,10 @@
     "filterListId": 2134,
     "tagId": 35
   },
+  {
+    "filterListId": 2134,
+    "tagId": 41
+  },
   {
     "filterListId": 2135,
     "tagId": 21
@@ -11395,6 +11447,10 @@
     "filterListId": 2289,
     "tagId": 9
   },
+  {
+    "filterListId": 2290,
+    "tagId": 40
+  },
   {
     "filterListId": 2291,
     "tagId": 3
@@ -11623,62 +11679,6 @@
     "filterListId": 2337,
     "tagId": 41
   },
-  {
-    "filterListId": 1958,
-    "tagId": 41
-  },
-  {
-    "filterListId": 1963,
-    "tagId": 41
-  },
-  {
-    "filterListId": 1957,
-    "tagId": 41
-  },
-  {
-    "filterListId": 2134,
-    "tagId": 41
-  },
-  {
-    "filterListId": 245,
-    "tagId": 41
-  },
-  {
-    "filterListId": 2290,
-    "tagId": 40
-  },
-  {
-    "filterListId": 255,
-    "tagId": 40
-  },
-  {
-    "filterListId": 265,
-    "tagId": 40
-  },
-  {
-    "filterListId": 266,
-    "tagId": 40
-  },
-  {
-    "filterListId": 764,
-    "tagId": 40
-  },
-  {
-    "filterListId": 392,
-    "tagId": 40
-  },
-  {
-    "filterListId": 1979,
-    "tagId": 40
-  },
-  {
-    "filterListId": 1980,
-    "tagId": 40
-  },
-  {
-    "filterListId": 825,
-    "tagId": 40
-  },
   {
     "filterListId": 2338,
     "tagId": 3