diff --git a/package-lock.json b/package-lock.json
index d7c0a33..59badf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
 			"license": "CC-BY-SA-3.0",
 			"dependencies": {
 				"tslib": "2.0.3",
-				"twinkle-core": "^3.0.2-beta"
+				"twinkle-core": "^3.0.7-beta"
 			},
 			"devDependencies": {
 				"@types/chai": "^4.2.16",
@@ -39,7 +39,7 @@
 				"prettier": "^2.2.1",
 				"prompts": "^2.4.1",
 				"ts-jest": "^26.5.5",
-				"ts-loader": "8.0.13",
+				"ts-loader": "8.1.0",
 				"typescript": "4.1.2",
 				"webpack": "^5.33.2",
 				"webpack-cli": "^4.6.0",
@@ -1197,6 +1197,14 @@
 			"integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
 			"dev": true
 		},
+		"node_modules/@types/select2": {
+			"version": "4.0.53",
+			"resolved": "https://registry.npmjs.org/@types/select2/-/select2-4.0.53.tgz",
+			"integrity": "sha512-5+HxxtKgyR954mFL61pNvKenx55gYinkYfSG5tVeItvmHhc2h+yRiGXNTYSwcrAcrUJ2ewLgOxG3STZRsPEnag==",
+			"dependencies": {
+				"@types/jquery": "*"
+			}
+		},
 		"node_modules/@types/sizzle": {
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
@@ -8216,29 +8224,17 @@
 			}
 		},
 		"node_modules/loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+			"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
 			"dev": true,
 			"dependencies": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
+				"json5": "^2.1.2"
 			},
 			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/loader-utils/node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
+				"node": ">=8.9.0"
 			}
 		},
 		"node_modules/locate-path": {
@@ -12428,16 +12424,16 @@
 			}
 		},
 		"node_modules/ts-loader": {
-			"version": "8.0.13",
-			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.13.tgz",
-			"integrity": "sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA==",
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.1.0.tgz",
+			"integrity": "sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==",
 			"dev": true,
 			"dependencies": {
-				"chalk": "^2.3.0",
+				"chalk": "^4.1.0",
 				"enhanced-resolve": "^4.0.0",
-				"loader-utils": "^1.0.2",
+				"loader-utils": "^2.0.0",
 				"micromatch": "^4.0.0",
-				"semver": "^6.0.0"
+				"semver": "^7.3.4"
 			},
 			"engines": {
 				"node": ">=10.0.0"
@@ -12447,77 +12443,6 @@
 				"webpack": "*"
 			}
 		},
-		"node_modules/ts-loader/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/ts-loader/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/ts-loader/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/ts-loader/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"node_modules/ts-loader/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/ts-loader/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/ts-loader/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/tslib": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
@@ -12563,11 +12488,12 @@
 			"dev": true
 		},
 		"node_modules/twinkle-core": {
-			"version": "3.0.2-beta",
-			"resolved": "https://registry.npmjs.org/twinkle-core/-/twinkle-core-3.0.2-beta.tgz",
-			"integrity": "sha512-3KqYESmF0gpZQZvV7iBCTF76ac3agyqyr4MIaDWcVpdpkro74uM4AZvUCnFcut6SykZMlf1xqhIEhep2S63dUw==",
+			"version": "3.0.7-beta",
+			"resolved": "https://registry.npmjs.org/twinkle-core/-/twinkle-core-3.0.7-beta.tgz",
+			"integrity": "sha512-54YuDI5yfNuBKtBORJl5cEwlcYXnyW1YZbEaIj1Nzlw8NHwTSAesSC1HDgRTtgVTRVOsCRtFDbW8TLzA7MzbpA==",
 			"dependencies": {
-				"orange-i18n": "^1.4.0",
+				"@types/select2": "^4.0.53",
+				"orange-i18n": "^1.5.0",
 				"types-mediawiki": "^1.1.0"
 			}
 		},
@@ -15042,6 +14968,14 @@
 			"integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
 			"dev": true
 		},
+		"@types/select2": {
+			"version": "4.0.53",
+			"resolved": "https://registry.npmjs.org/@types/select2/-/select2-4.0.53.tgz",
+			"integrity": "sha512-5+HxxtKgyR954mFL61pNvKenx55gYinkYfSG5tVeItvmHhc2h+yRiGXNTYSwcrAcrUJ2ewLgOxG3STZRsPEnag==",
+			"requires": {
+				"@types/jquery": "*"
+			}
+		},
 		"@types/sizzle": {
 			"version": "2.3.2",
 			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
@@ -15323,7 +15257,8 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz",
 			"integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"@webpack-cli/info": {
 			"version": "1.2.3",
@@ -15338,7 +15273,8 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz",
 			"integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"@xtuc/ieee754": {
 			"version": "1.2.0",
@@ -15394,7 +15330,8 @@
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
 			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"acorn-walk": {
 			"version": "7.2.0",
@@ -15437,13 +15374,15 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
 			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"ajv-keywords": {
 			"version": "3.5.2",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
 			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"ansi-colors": {
 			"version": "4.1.1",
@@ -17553,7 +17492,8 @@
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/expect-playwright/-/expect-playwright-0.3.3.tgz",
 			"integrity": "sha512-uoeyx2D5LawJdziMdweOp6cnZzFOOPT9VvPG6gOh6YC7N9pU0k2KpVlRiz/Vc/fFBiGUNNeJq2Aq+9GJ65Nfrw==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"express": {
 			"version": "4.17.1",
@@ -19854,7 +19794,8 @@
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
 			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"jest-process-manager": {
 			"version": "0.2.9",
@@ -20542,25 +20483,14 @@
 			"dev": true
 		},
 		"loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+			"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
 			"dev": true,
 			"requires": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				}
+				"json5": "^2.1.2"
 			}
 		},
 		"locate-path": {
@@ -23865,74 +23795,16 @@
 			}
 		},
 		"ts-loader": {
-			"version": "8.0.13",
-			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.13.tgz",
-			"integrity": "sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA==",
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.1.0.tgz",
+			"integrity": "sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.3.0",
+				"chalk": "^4.1.0",
 				"enhanced-resolve": "^4.0.0",
-				"loader-utils": "^1.0.2",
+				"loader-utils": "^2.0.0",
 				"micromatch": "^4.0.0",
-				"semver": "^6.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-					"dev": true,
-					"requires": {
-						"color-name": "1.1.3"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"semver": "^7.3.4"
 			}
 		},
 		"tslib": {
@@ -23973,11 +23845,12 @@
 			"dev": true
 		},
 		"twinkle-core": {
-			"version": "3.0.2-beta",
-			"resolved": "https://registry.npmjs.org/twinkle-core/-/twinkle-core-3.0.2-beta.tgz",
-			"integrity": "sha512-3KqYESmF0gpZQZvV7iBCTF76ac3agyqyr4MIaDWcVpdpkro74uM4AZvUCnFcut6SykZMlf1xqhIEhep2S63dUw==",
+			"version": "3.0.7-beta",
+			"resolved": "https://registry.npmjs.org/twinkle-core/-/twinkle-core-3.0.7-beta.tgz",
+			"integrity": "sha512-54YuDI5yfNuBKtBORJl5cEwlcYXnyW1YZbEaIj1Nzlw8NHwTSAesSC1HDgRTtgVTRVOsCRtFDbW8TLzA7MzbpA==",
 			"requires": {
-				"orange-i18n": "^1.4.0",
+				"@types/select2": "^4.0.53",
+				"orange-i18n": "^1.5.0",
 				"types-mediawiki": "^1.1.0"
 			}
 		},
@@ -25022,7 +24895,8 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
 			"integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"xml-name-validator": {
 			"version": "3.0.0",
diff --git a/package.json b/package.json
index 51d730a..90c1093 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 	],
 	"dependencies": {
 		"tslib": "2.0.3",
-		"twinkle-core": "^3.0.2-beta"
+		"twinkle-core": "^3.0.7-beta"
 	},
 	"devDependencies": {
 		"@types/chai": "^4.2.16",
@@ -57,7 +57,7 @@
 		"prettier": "^2.2.1",
 		"prompts": "^2.4.1",
 		"ts-jest": "^26.5.5",
-		"ts-loader": "8.0.13",
+		"ts-loader": "8.1.0",
 		"typescript": "4.1.2",
 		"webpack": "^5.33.2",
 		"webpack-cli": "^4.6.0",