diff --git a/api/functions/commands.js b/api/functions/commands.js
index a2a5d232..2d6e7d8c 100644
--- a/api/functions/commands.js
+++ b/api/functions/commands.js
@@ -16,7 +16,7 @@ const {
 const azure = require('azure-storage');
 const slug = require('slug');
 
-exports.insertScanResult = (api, buildId, runId, data, buildDate) => {
+exports.insertScanResult = async (api, buildId, runId, data, buildDate, url) => {
 	const entGen = azure.TableUtilities.entityGenerator;
 	let entity = {
 		PartitionKey: entGen.String(api),
@@ -24,7 +24,18 @@ exports.insertScanResult = (api, buildId, runId, data, buildDate) => {
 		buildId: entGen.String(buildId),
 		runId: entGen.String(runId),
 		buildDate: entGen.DateTime(buildDate),
+		apiKey: entGen.String(api)
 	};
+	let entityRunIndexed = {
+		...entity,
+		PartitionKey: entGen.String(`${api}-${runId}`),
+	};
+	let entityUrlIndexed = {
+		...entity,
+		PartitionKey: entGen.String(`${api}-${slug(url)}`),
+	};
+	await insertEntity(TABLE.ScanResults, replaceProp(data, entityRunIndexed));
+	await insertEntity(TABLE.ScanResults, replaceProp(data, entityUrlIndexed));
 	return insertEntity(TABLE.ScanResults, replaceProp(data, entity));
 };
 
@@ -105,16 +116,28 @@ exports.addHTMLHintRulesForEachRun = (api, data) => {
 	);
 };
 
-exports.insertScanSummary = (api, buildId, runId, buildDate, data) => {
+exports.insertScanSummary = async (api, buildId, runId, buildDate, data) => {
 	var entGen = azure.TableUtilities.entityGenerator;
 	// use Log tail pattern to get native sort from Table Storage
-	var entity = {
+	const entity = {
 		PartitionKey: entGen.String(api),
 		RowKey: entGen.String(getReversedTick()),
 		buildId: entGen.String(buildId),
 		runId: entGen.String(runId),
 		buildDate: entGen.DateTime(buildDate),
+		scanResultVersion: entGen.Int32(2),
+		apiKey: entGen.String(api)
+	};
+	const entityRunIndexed = {
+		...entity,
+		PartitionKey: entGen.String(`${api}-${runId}`),
 	};
+	let entityUrlIndexed = {
+		...entity,
+		PartitionKey: entGen.String(`${api}-${slug(data.url)}`),
+	};
+	await insertEntity(TABLE.Scans, replaceProp(data, entityRunIndexed));
+	await insertEntity(TABLE.Scans, replaceProp(data, entityUrlIndexed));
 	return insertEntity(TABLE.Scans, replaceProp(data, entity));
 };
 
@@ -139,6 +162,17 @@ exports.removeAlertEmailAddress = (api, rowkey) => {
 	return deleteEntity(TABLE.alertEmailAddresses, entity);
 };
 
+exports.addCustomHtmlRuleOptions = (api, data) => {
+	const entGen = azure.TableUtilities.entityGenerator;
+	return updateEntity(
+		TABLE.HtmlRulesCustomOptions,
+		replaceProp(data, {
+			PartitionKey: entGen.String(api),
+			RowKey: entGen.String(data.ruleId),
+		})
+	);
+};
+
 exports.uploadLighthouseReport = (runId, lhr) =>
 	uploadBlob(BLOB.lhr, `${runId}.json`, JSON.stringify(lhr));
 
diff --git a/api/functions/consts.js b/api/functions/consts.js
index bc62242f..2c9a2dee 100644
--- a/api/functions/consts.js
+++ b/api/functions/consts.js
@@ -14,7 +14,8 @@ exports.TABLE = {
 	ScanResults: 'ScanResults',
 	htmlhintrules: 'htmlhintrules',
 	alertEmailAddresses: 'alertEmailAddresses',
-	UnscannableLinks: 'UnscannableLinks'
+	UnscannableLinks: 'UnscannableLinks',
+	HtmlRulesCustomOptions: 'HtmlRulesCustomOptions'
 };
 
 // blob storage names cannot have uppercase or numbers
diff --git a/api/functions/index.js b/api/functions/index.js
index a986e309..0a822ec9 100644
--- a/api/functions/index.js
+++ b/api/functions/index.js
@@ -22,6 +22,7 @@ const {
 	addHTMLHintRulesForEachRun,
 	addAlertEmailAddresses,
 	removeAlertEmailAddress,
+	addCustomHtmlRuleOptions,
 } = require('./commands');
 const {
 	getPersonalSummary,
@@ -39,6 +40,7 @@ const {
 	getAllScanSummaryFromUrl,
 	getUnscannableLinks,
 	compareScans,
+	getCustomHtmlRuleOptions,
 } = require('./queries');
 const {
 	newGuid,
@@ -179,6 +181,14 @@ app.get('/unscannableLinks', async (req, res) => {
 	res.json(await getUnscannableLinks());
 });
 
+app.post('/config/getCustomHtmlRuleOptions/:api', async (req, res) => {
+	res.json(await getCustomHtmlRuleOptions(req.params.api, req.body.url));
+});
+
+app.post('/config/addCustomHtmlRuleOptions/:api', async (req, res) => {
+	res.json(await addCustomHtmlRuleOptions(req.params.api, req.body));
+});
+
 app.post('/scanresult/:api/:buildId', async (req, res) => {
 	const {
 		badUrls,
@@ -230,7 +240,6 @@ app.post('/scanresult/:api/:buildId', async (req, res) => {
 	const buildId = req.params.buildId;
 	const runId = newGuid();
 	const buildDate = new Date();
-	const unscannableLinks = await getUnscannableLinks();
 
 	const uid = await getUserIdFromApiKey(apikey);
 	if (!uid) {
@@ -314,7 +323,8 @@ app.post('/scanresult/:api/:buildId', async (req, res) => {
 						buildId,
 						runId,
 						brokenLinkData,
-						buildDate
+						buildDate,
+						url
 					);
 					cb(data);
 				}, {
diff --git a/api/functions/queries.js b/api/functions/queries.js
index 89fe8601..b0f46447 100644
--- a/api/functions/queries.js
+++ b/api/functions/queries.js
@@ -72,7 +72,14 @@ exports.getConfig = (api) =>
 
 exports.getScanDetails = async (runId) => {
 	const scan = await exports.getSummaryById(runId);
-	const filter = odata`PartitionKey eq ${scan.partitionKey} and src ge ${scan.url} and src le ${incrementString(scan.url)}`;
+	let filter;
+
+	if (scan.scanResultVersion === 2) {
+		filter = `PartitionKey eq '${scan.partitionKey}-${slug(scan.url)}'`;
+	} else {
+		filter = odata`PartitionKey eq ${scan.partitionKey} and src ge ${scan.url} and src le ${incrementString(scan.url)}`;
+	}
+
     const entity = new TableClient(azureUrl, TABLE.ScanResults, credential).listEntities({
         queryOptions: { filter }
     });
@@ -208,7 +215,10 @@ exports.getAllPublicSummary = (showAll) =>
 			for await (const item of entity) {
 				result.push(item);
 			}
-			resolve(result)
+
+			resolve(result.filter((value, index, self) => {
+				return self.findIndex(v => v.runId === value.runId) === index;
+			}))
 		} else {
 			// Top 500 scans in last 24 months
 			var date = new Date();
@@ -218,24 +228,39 @@ exports.getAllPublicSummary = (showAll) =>
 				queryOptions: { filter: odata`isPrivate eq ${false} and buildDate gt datetime'${date.toISOString()}'` }
 			});
 			const iterator = entity.byPage({ maxPageSize: parseInt(process.env.MAX_SCAN_SIZE) });
+			let result = [];
 			for await (const item of iterator) {
-				resolve(item)
+				result = item;
 				break;
 			}
+
+			resolve(result.filter((value, index, self) => {
+				return self.findIndex(v => v.runId === value.runId) === index;
+			}))
 		}
 	});
 
 exports.getSummaryById = (runId) => 
 	getRun(runId).then((doc) =>
 		new Promise(async (resolve) => {
-			const entity = new TableClient(azureUrl, TABLE.Scans, credential).listEntities({
-				queryOptions: { filter: odata`PartitionKey eq ${doc.apikey} and runId eq ${doc.runId}` }
-			});
-			let result = []
-			for await (const item of entity) {
-				result.push(item);
+			const getSummary = async (filter) => {
+				const entity = new TableClient(azureUrl, TABLE.Scans, credential).listEntities({
+					queryOptions: { filter }
+				});
+				let result = []
+				for await (const item of entity) {
+					result.push(item);
+				}
+				return result[0];
+			};
+
+			let summary = await getSummary(`PartitionKey eq '${doc.apikey}-${doc.runId}'`);
+
+			if (!summary) {
+				summary = await getSummary(odata`PartitionKey eq ${doc.apikey} and runId eq ${doc.runId}`);
 			}
-			resolve(result[0] || {})
+			
+			resolve(summary || {});
 		}));
 
 exports.getLatestSummaryFromUrlAndApi = (url, api) => 
@@ -272,19 +297,30 @@ exports.getAlertEmailAddressesFromTokenAndUrl = (api, url) =>
 
 exports.getAllScanSummaryFromUrl = (url, api) =>
 	new Promise(async (resolve) => {
-		const entity = new TableClient(azureUrl, TABLE.Scans, credential).listEntities({
-			queryOptions: { filter: odata`url eq ${url} and PartitionKey eq ${api}` }
-		});
-		const iterator = entity.byPage({ maxPageSize: 10 });
-		for await (const item of iterator) {
-			if (item[0]) {
-				const existing = await getExistingBrokenLinkCount(item[0].runId);
-				item[0].totalUniqueBrokenLinksExisting = existing;
+		const getSummary = async (filter) => {
+			const entity = new TableClient(azureUrl, TABLE.Scans, credential).listEntities({
+				queryOptions: { filter }
+			});
+			const iterator = entity.byPage({ maxPageSize: 10 });
+			let result;
+			for await (const item of iterator) {
+				if (item[0]) {
+					const existing = await getExistingBrokenLinkCount(item[0].runId);
+					item[0].totalUniqueBrokenLinksExisting = existing;
+				}
+				result = item;
+				break;
 			}
-			
-			resolve(item);
-			break;
+			return result;
+		};
+
+		let summary = await getSummary(`PartitionKey eq '${api}-${slug(url)}'`);
+
+		if (!summary) {
+			summary = await getSummary(odata`url eq ${url} and PartitionKey eq ${api}`);
 		}
+
+		resolve(summary);
 	});
 
 exports.getUnscannableLinks = () =>
@@ -332,3 +368,15 @@ exports.compareScans = (api, url) =>
 		} 
 		resolve(isErrorUp)
 	});
+
+exports.getCustomHtmlRuleOptions = (api, url) => 
+	new Promise(async (resolve) => {
+		const entity = new TableClient(azureUrl, TABLE.HtmlRulesCustomOptions, credential).listEntities({
+			queryOptions: { filter: odata`PartitionKey eq ${api} and url eq ${url}` }
+		});
+		let result = []
+		for await (const item of entity) {
+			result.push(item);
+		}
+		resolve(result || [])
+	})
\ No newline at end of file
diff --git a/docker/api.js b/docker/api.js
index cfa2013f..b431d536 100644
--- a/docker/api.js
+++ b/docker/api.js
@@ -125,6 +125,20 @@ exports.getAllScanSummaryFromUrl = (api, url) => {
   );
 };
 
+exports.getCustomHtmlRuleOptions = (api, url) => {
+  return fetch(`${endpoint}/api/config/getCustomHtmlRuleOptions/${api}`, {
+    method: "POST",
+    body: JSON.stringify({url}),
+    headers: { "Content-Type": "application/json" },
+  }).then((res) => {
+    if (res) {
+      return res.ok ? res.json() : [];
+    } else {
+      throw Error("Failed to get custom html rule options");
+    }
+  });
+};
+
 exports.htmlHintConfig = {
   "grammar-scrum-terms": true,
   "code-block-missing-language": true,
diff --git a/docker/customHtmlRules.js b/docker/customHtmlRules.js
index 43eedb7e..0c552d4e 100644
--- a/docker/customHtmlRules.js
+++ b/docker/customHtmlRules.js
@@ -1,7 +1,10 @@
+const { getCustomHtmlRuleOptions } = require("./api");
 const HTMLHint = require("htmlhint").default;
 const findPhoneNumbersInText = require('libphonenumber-js').findPhoneNumbersInText;
 
-exports.addCustomHtmlRule = () => {
+exports.addCustomHtmlRule = async (apiToken, url) => {
+  const customRuleOptions = await getCustomHtmlRuleOptions(apiToken, url);
+
   HTMLHint.addRule({
     id: "code-block-missing-language",
     description: "Code blocks must contain a language specifier.",
@@ -380,9 +383,15 @@ exports.addCustomHtmlRule = () => {
       parser.addListener("tagstart", (event) => {
         var tagName = event.tagName.toLowerCase(),
         mapAttrs = parser.getMapAttrs(event.attrs);
+        const ruleId = "detect-absolute-references-url-path-correctly";
         if (tagName === "a") {
           if (mapAttrs["href"]) {
-            if (mapAttrs["href"].startsWith("https://ssw.com.au/rules")) {
+            // Check if custom options exist in this rule
+            let optionValue = '';
+            if (customRuleOptions && customRuleOptions.length > 0 && customRuleOptions.filter(option => option.ruleId === ruleId).length > 0) {
+              optionValue = customRuleOptions.find(option => option.ruleId === ruleId).optionValue
+            }
+            if (mapAttrs["href"].startsWith(optionValue.length > 0 ? optionValue : "https://ssw.com.au/rules")) {
               if (!mapAttrs["href"].startsWith("/")) {
               reporter.warn(
                 "URLs must be formatted to direct to a url path correctly.",
@@ -433,17 +442,26 @@ exports.addCustomHtmlRule = () => {
       var self = this;
 
       parser.addListener("text", (event) => {
-        var spellings = [
-          "a.k.a",
-          "A.K.A",
-          "AKA",
-          "e-mail",
-          "EMail",
-          "can not",
-          "web site",
-          "user name",
-          "task bar"
-        ];
+        const ruleId = "common-spelling-mistakes";
+        let optionValue = [];
+        // Check if custom options exist in this rule
+        if (customRuleOptions && customRuleOptions.length > 0 && customRuleOptions.filter(option => option.ruleId === ruleId).length > 0) {
+          optionValue = customRuleOptions.find(option => option.ruleId === ruleId).optionValue.split(',');
+        }
+        var spellings = 
+          optionValue.length > 0 ? 
+          optionValue :
+          [
+            "a.k.a",
+            "A.K.A",
+            "AKA",
+            "e-mail",
+            "EMail",
+            "can not",
+            "web site",
+            "user name",
+            "task bar"
+          ];
 
         if (event.raw) {
           const pageContent = event.raw;
@@ -485,7 +503,12 @@ exports.addCustomHtmlRule = () => {
       init: function (parser, reporter) {
         const self = this;
         let isInCodeBlock = false;
+        let optionValue = '';
         parser.addListener("tagstart", (event) => {
+          // Check if custom options exist in this rule
+          if (customRuleOptions && customRuleOptions.length > 0 && customRuleOptions.filter(option => option.ruleId === ruleId).length > 0) {
+            optionValue = customRuleOptions.find(option => option.ruleId === ruleId).optionValue
+          }
           const tagName = event.tagName.toLowerCase();
           if (tagName === "code") {
             isInCodeBlock = true;
@@ -498,7 +521,9 @@ exports.addCustomHtmlRule = () => {
           }
         });
         parser.addListener("text", (event) => {
-          if (event.raw && event.lastEvent && findPhoneNumbersInText(event.raw, "AU").length) {
+          // Replace "." and "/" characters to avoid false positives when parsing phone numbers
+          const text = event.raw?.replace(/\.|\//g, "_");
+          if (text && event.lastEvent && findPhoneNumbersInText(text, optionValue.length > 0 ? optionValue : 'AU').length) {
             const pageContent = event.lastEvent.raw;
             if (pageContent && event.lastEvent.tagName) {
               const tagName = event.lastEvent.tagName.toLowerCase();
diff --git a/docker/index.js b/docker/index.js
index 9dcfe063..b72ef376 100644
--- a/docker/index.js
+++ b/docker/index.js
@@ -29,6 +29,7 @@ const {
   runArtilleryLoadTest
 } = require("./utils");
 const { htmlHintConfig } = require("./api");
+const { addCustomHtmlRule } = require("./customHtmlRules");
 
 const LIGHTHOUSEFOLDER = "./lhr.json";
 const ARTILLERYFOLDER = "./artilleryOut.json";
@@ -230,9 +231,12 @@ const processAndUpload = async (
     [atr, atrSummary] = readArtilleryReport(ARTILLERYFOLDER, writeLog);
   }
 
-  const { addCustomHtmlRule } = require("./customHtmlRules");
   if (args.htmlhint) {
-    addCustomHtmlRule();
+    if (args.token) {
+      await addCustomHtmlRule(args.token, args.url);
+    } else {
+      await addCustomHtmlRule();
+    };
     [htmlIssuesSummary, htmlIssues] = await runHtmlHint(
       args.url,
       results,
diff --git a/docker/test/anchor-names-must-be-valid.spec.js b/docker/test/anchor-names-must-be-valid.spec.js
index 4464b969..d738ac3c 100644
--- a/docker/test/anchor-names-must-be-valid.spec.js
+++ b/docker/test/anchor-names-must-be-valid.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Anchor name starts with letter and contains no space should not result in an error', () => {
     const code = '<a name="ThisisAnchor">Anchor</a>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/code-block-missing-language.spec.js b/docker/test/code-block-missing-language.spec.js
index 1f949331..b98be909 100644
--- a/docker/test/code-block-missing-language.spec.js
+++ b/docker/test/code-block-missing-language.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Code block with data language specifier should not result in an error', () => {
     const code = '<pre data-language="javascript">Some Code</pre>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/common-spelling-mistakes.spec.js b/docker/test/common-spelling-mistakes.spec.js
index 5549b574..bd4bbd66 100644
--- a/docker/test/common-spelling-mistakes.spec.js
+++ b/docker/test/common-spelling-mistakes.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruleId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruleId}`, () => {
-  addCustomHtmlRule();
   it("terms used correctly should not result in an error", () => {
     const code = "<p>aka email cannot website username taskbar</p>";
     const messages = HTMLHint.verify(code, ruleOptions);
diff --git a/docker/test/detect-absolute-references-correctly.spec.js b/docker/test/detect-absolute-references-correctly.spec.js
index dd35056f..a673f692 100644
--- a/docker/test/detect-absolute-references-correctly.spec.js
+++ b/docker/test/detect-absolute-references-correctly.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruldId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it("Bad example should result in an error", () => {
     const code = '<a href="https://ssw.com.au/rules/when-you-use-mentions-in-a-pbi/" />';
     const messages = HTMLHint.verify(code, ruleOptions);
diff --git a/docker/test/figure-must-use-the-right-code.spec.js b/docker/test/figure-must-use-the-right-code.spec.js
index d67c3133..16313b7a 100644
--- a/docker/test/figure-must-use-the-right-code.spec.js
+++ b/docker/test/figure-must-use-the-right-code.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruldId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it("Figures not wrapped in figcaption must result in an error", () => {
     const code = "<p>Figure: Caption</p>";
     const messages = HTMLHint.verify(code, ruleOptions);
diff --git a/docker/test/font-tag-must-not-be-used.spec.js b/docker/test/font-tag-must-not-be-used.spec.js
index 165e1979..9164fb1d 100644
--- a/docker/test/font-tag-must-not-be-used.spec.js
+++ b/docker/test/font-tag-must-not-be-used.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Anything that is not font tag should not result in an error', () => {
     const code = '<p color="red">Text</p>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/grammar-scrum-terms.spec.js b/docker/test/grammar-scrum-terms.spec.js
index a2ccff16..3ade66f1 100644
--- a/docker/test/grammar-scrum-terms.spec.js
+++ b/docker/test/grammar-scrum-terms.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruldId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it("Scrum terms that are cased correctly should not result in an error", () => {
     const code =
       "<p>Scrum, Sprint, Product Owner, Scrum Master, Product Backlog, Sprint Review, Sprint Planning, Sprint Retrospective, Sprint Retro, Specification Review, Spec Review</p>";
diff --git a/docker/test/link-must-not-show-unc.spec.js b/docker/test/link-must-not-show-unc.spec.js
index 5584a133..f48998ea 100644
--- a/docker/test/link-must-not-show-unc.spec.js
+++ b/docker/test/link-must-not-show-unc.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Href that does not show UNC should not result in an error', () => {
     const code = '<a href="/ssw">somelink</a>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/meta-tags-must-not-redirect.spec.js b/docker/test/meta-tags-must-not-redirect.spec.js
index f407a16a..ddecba3b 100644
--- a/docker/test/meta-tags-must-not-redirect.spec.js
+++ b/docker/test/meta-tags-must-not-redirect.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Meta tags that does not refresh should not result in an error', () => {
     const code = '<meta name="description" />'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/page-must-not-show-email-addresses.spec.js b/docker/test/page-must-not-show-email-addresses.spec.js
index e24babbe..7121a32f 100644
--- a/docker/test/page-must-not-show-email-addresses.spec.js
+++ b/docker/test/page-must-not-show-email-addresses.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('Page that does not show email addresses should not result in an error', () => {
     const code = '<a href="...">email address</a>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/phone-numbers-without-links.js b/docker/test/phone-numbers-without-links.js
index d497254a..87e8406c 100644
--- a/docker/test/phone-numbers-without-links.js
+++ b/docker/test/phone-numbers-without-links.js
@@ -23,11 +23,15 @@ const nonPhoneNumbers = [
   "2023.05.31.02",
   "123.456.7890",
   "1234.567.890",
-  "20231024.16"
+  "20231024.16",
+  "20231102.4"
 ];
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruleId}`, () => {
-  addCustomHtmlRule();
 
   phoneNumbers.forEach((phone) => {
     it(`text containing "${phone}" without hyperlink should error`, () => {
diff --git a/docker/test/url-must-be-formatted-correctly.spec.js b/docker/test/url-must-be-formatted-correctly.spec.js
index eb030877..cc0d9aaa 100644
--- a/docker/test/url-must-be-formatted-correctly.spec.js
+++ b/docker/test/url-must-be-formatted-correctly.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruldId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it("URL with full stop at the end should result in an error", () => {
     const code = '<a href="www.ssw.com.au/Thisisarule." />';
     const messages = HTMLHint.verify(code, ruleOptions);
diff --git a/docker/test/url-must-not-have-click-here.spec.js b/docker/test/url-must-not-have-click-here.spec.js
index fe0ceef7..bf5ede55 100644
--- a/docker/test/url-must-not-have-click-here.spec.js
+++ b/docker/test/url-must-not-have-click-here.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('URL text without words click here should not result in an error', () => {
     const code = '<a href="www.ssw.com.au/Thisisarule">Not Click Here</a>'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/url-must-not-have-space.spec.js b/docker/test/url-must-not-have-space.spec.js
index 0a85a2c0..81f909f6 100644
--- a/docker/test/url-must-not-have-space.spec.js
+++ b/docker/test/url-must-not-have-space.spec.js
@@ -9,8 +9,11 @@ const {addCustomHtmlRule} = require('../customHtmlRules')
 
 ruleOptions[ruldId] = true
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it('URL without space should not result in an error', () => {
     const code = '<a href="www.ssw.com.au/Thisisarule" />'
     const messages = HTMLHint.verify(code, ruleOptions)
diff --git a/docker/test/use-unicode-hex-code-for-special-html-characters.spec.js b/docker/test/use-unicode-hex-code-for-special-html-characters.spec.js
index d506f70e..27041d6c 100644
--- a/docker/test/use-unicode-hex-code-for-special-html-characters.spec.js
+++ b/docker/test/use-unicode-hex-code-for-special-html-characters.spec.js
@@ -9,8 +9,11 @@ const { addCustomHtmlRule } = require("../customHtmlRules");
 
 ruleOptions[ruldId] = true;
 
+before(async () => {
+  await addCustomHtmlRule();
+});
+
 describe(`Rules: ${ruldId}`, () => {
-  addCustomHtmlRule();
   it("Non code tag with special char should result in an error", () => {
     const code = '<span>aaa>bbb<ccc</span>';
     const messages = HTMLHint.verify(code, ruleOptions);
diff --git a/ui/src/components/detailslotcomponents/BuildDetailsSlot.svelte b/ui/src/components/detailslotcomponents/BuildDetailsSlot.svelte
index 188e7e9d..4068a2f8 100644
--- a/ui/src/components/detailslotcomponents/BuildDetailsSlot.svelte
+++ b/ui/src/components/detailslotcomponents/BuildDetailsSlot.svelte
@@ -14,6 +14,7 @@
   export let user;
 
   let threshold = {};
+  let customHtmlRuleOptions = [];
   let htmlHintRulesShown;
   let loadingHtmlHintSettings;
   let scanUrl;
@@ -29,6 +30,16 @@
     htmlHintRulesShown = true;
     loadingHtmlHintSettings = true;
     try {
+      // Retrieve custom HTML Rules input options
+      const optionRes = await fetch(`${CONSTS.API}/api/config/getCustomHtmlRuleOptions/${user.apiKey}`, {
+        method: "POST",
+        body: JSON.stringify({url: scanUrl}),
+        headers: { "Content-Type": "application/json" },
+      })
+      const optionResult = await optionRes.json();
+      customHtmlRuleOptions = optionResult || [];
+
+      // Retrieve selected custom HTML Rules 
       const res = await fetch(
         `${CONSTS.API}/api/config/${user.apiKey}/htmlhintrules/${slug(scanUrl)}`
       );
@@ -37,6 +48,7 @@
     } catch (error) {
       console.error("error getting threshold", error);
       threshold = {};
+      customHtmlRuleOptions = [];
     } finally {
       loadingHtmlHintSettings = false;
     }
@@ -101,6 +113,8 @@
     {user}
     {htmlRules}
     {threshold}
+    {customHtmlRuleOptions}
+    on:htmlHintThreshold={() => showHtmlHintThreshold(data.summary, user)}
   />
 {:else}
   <UpdateHtmlRules 
@@ -110,6 +124,8 @@
     {user}
     htmlRules={null}
     threshold={null}
+    {customHtmlRuleOptions}
+    on:htmlHintThreshold={() => showHtmlHintThreshold(data.summary, user)}
   />
 {/if}
 
diff --git a/ui/src/components/htmlhintcomponents/UpdateHTMLRules.svelte b/ui/src/components/htmlhintcomponents/UpdateHTMLRules.svelte
index 2636dcef..f179a9c1 100644
--- a/ui/src/components/htmlhintcomponents/UpdateHTMLRules.svelte
+++ b/ui/src/components/htmlhintcomponents/UpdateHTMLRules.svelte
@@ -1,9 +1,9 @@
 <script>
   import Toastr from "../misccomponents/Toastr.svelte";
-  import { CONSTS, htmlHintRules, customHtmlHintRules, RuleType, rulePresets, PresetType } from "../../utils/utils";
+  import { CONSTS, htmlHintRules, customHtmlHintRules, RuleType, rulePresets, PresetType, customOptionInputType } from "../../utils/utils";
   import Modal from "../misccomponents//Modal.svelte";
   import LoadingFlat from "../misccomponents/LoadingFlat.svelte";
-  import { onMount, createEventDispatcher } from "svelte";
+  import { createEventDispatcher, onMount } from "svelte";
   import slug from "slug";
 
   export let url;
@@ -12,6 +12,7 @@
   export let user;
   export let htmlRules;
   export let threshold;
+  export let customHtmlRuleOptions = [];
 
   let saving;
   let addedSuccess;
@@ -20,17 +21,22 @@
   let presetSelection = [];
   
   // Check all selected htmlhint rules
-  let htmlHintSelectedRules = []
-  let customHtmlHintSelectedRules = []
+  let htmlHintSelectedRules = [];
+  let customHtmlHintSelectedRules = [];
 
   let showHistory = false;
   let historyLog = [];
 
+  let customOptionInput = '';
+  let multiInputValues = [''];
+
   $: htmlHintSelectedRules, handleSelectionChange();
   $: customHtmlHintSelectedRules, handleSelectionChange();
+  $: customHtmlRuleOptions;
 
   const dispatch = createEventDispatcher();
   const updateHtmlRules = () => dispatch("updateHtmlRules");
+  const updateHtmlHintCustomOption = () => dispatch("htmlHintThreshold");
   
   onMount(() => {
     initSelectedRules();
@@ -183,6 +189,30 @@
     currSelectedLog = index;
   }
 
+  let currSelectedCustomOption = -1;
+  const toggleCustomOption = (index, ruleSetting) => {
+    customOptionInput = null;
+    multiInputValues = [''];
+    currSelectedCustomOption = index;
+    if (ruleSetting) {
+      populateCustomOptions(ruleSetting)
+    }
+  }
+
+  const populateCustomOptions = (ruleSetting) => {
+    if (customHtmlRuleOptions && customHtmlRuleOptions.length > 0) {
+      customHtmlRuleOptions.forEach(option => {
+        if (option.ruleId === ruleSetting.rule) {
+          if (ruleSetting.customOptionInputType === customOptionInputType.multipleTextBoxes) {
+            multiInputValues = option.optionValue.split(',');
+          } else {
+            customOptionInput = option.optionValue;
+          }
+        }
+      })
+    }
+  }
+
   const formatHtmlRule = (rules) => {
     let selectedHtmlHintRules = rules.map(rule => htmlHintRules.find(x => x.rule === rule));
     let selectedCustomHtmlHintRules = rules.map(rule => customHtmlHintRules.find(x => x.rule === rule));
@@ -190,7 +220,50 @@
     let allHtmlRules = htmlHintRules.concat(customHtmlHintRules)
     return allHtmlRules.map(rule => ({...rule, isRuleEnabled: allSelectedRuleLog.includes(rule)}))
   };
-  
+
+  const addCustomRuleOptions = async (optionValue, ruleSetting) => {
+    saving = true;
+    const res = await fetch(
+      `${CONSTS.API}/api/config/addCustomHtmlRuleOptions/${user.apiKey}`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          ruleId: ruleSetting.rule, 
+          url, 
+          optionValue
+        }),
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+
+    if (res.ok) {
+      saving = false;
+      addedSuccess = true;
+      customOptionInput = null;
+      multiInputValues = [''];
+      toggleCustomOption(-1);
+      updateHtmlHintCustomOption();
+    } else {
+      throw new Error("Failed to load");
+    } 
+  }
+
+  const handleOnSubmit = (ruleSetting) => {
+    const optionValueInput = 
+      multiInputValues.length > 0 && multiInputValues.every(i => i) ?
+        multiInputValues.toString() :
+        customOptionInput;
+    addCustomRuleOptions(optionValueInput, ruleSetting);
+  }
+
+  const addField = () => {
+    multiInputValues = [...multiInputValues, ''];
+  };
+
+  const removeField = (index) => {
+    multiInputValues.splice(index, 1);
+    multiInputValues = multiInputValues;
+  };
 </script>
 
 <Modal
@@ -251,9 +324,9 @@
           </label>
         {/each}
       </div>
-      <h3 class="font-bold">HTML Hint Rules: </h3>
+      <h3 class="font-bold mb-2">HTML Hint Rules: </h3>
       {#each htmlHintSelectedRules as rule}
-        <label>
+        <div class="mb-2">
           <input type="checkbox" bind:checked={rule.isChecked} value={rule.rule} /> 
             <i class="{rule.type === RuleType.Error ? 'fas fa-exclamation-circle fa-md' : 'fas fa-exclamation-triangle fa-md'}" style="{rule.type === RuleType.Error ? 'color: red' : 'color: #d69e2e'}"></i> 
             <a 
@@ -262,21 +335,100 @@
             href="https://htmlhint.com/docs/user-guide/rules/{rule.rule}">
               {rule.displayName}
             </a>
-        </label>
+        </div>
       {/each}
       <br />
-      <h3 class="font-bold">Custom HTML Rules: </h3>
-      {#each customHtmlHintSelectedRules as rule}
-        <label>
+      <h3 class="font-bold mb-2">Custom HTML Rules: </h3>
+      {#each customHtmlHintSelectedRules as rule, index}
+        <div class="mb-2">
           <input type="checkbox" bind:checked={rule.isChecked} value={rule.rule} /> 
-            <i class="{rule.type === RuleType.Error ? 'fas fa-exclamation-circle fa-md' : 'fas fa-exclamation-triangle fa-md'}" style="{rule.type === RuleType.Error ? 'color: red' : 'color: #d69e2e'}"></i> 
-            <a 
-            target="_blank"
-            class="{rule.ruleLink ? 'link' : 'hover:no-underline cursor-text'} inline-block align-baseline" 
-            href={rule.ruleLink}>
-              {rule.displayName}
-            </a>
-        </label>
+          <i class="{rule.type === RuleType.Error ? 'fas fa-exclamation-circle fa-md' : 'fas fa-exclamation-triangle fa-md'}" style="{rule.type === RuleType.Error ? 'color: red' : 'color: #d69e2e'}"></i> 
+          <a 
+          target="_blank"
+          class="{rule.ruleLink ? 'link' : 'hover:no-underline cursor-text'} inline-block align-baseline" 
+          href={rule.ruleLink}>
+            {rule.displayName}
+          </a>
+          {#if rule.isEnableCustomOptions}
+            <span class="cursor-pointer">
+              <button 
+                class="textred px-2 py-1"
+                style="border: none"
+                on:click={() => toggleCustomOption(index, rule)} 
+                on:keypress={undefined}
+              ><i class="fas fa-pen-to-square"></i> Edit</button>
+            </span>
+            <div class="bggrey mt-2">
+              {#if customHtmlRuleOptions && customHtmlRuleOptions.length > 0 && customHtmlRuleOptions.find(x => x.ruleId === rule.rule)?.optionValue.length > 0}
+                <div class="ml-5">
+                  <span class="font-sans font-bold">
+                    Applied custom option value: 
+                  </span>
+                  <span class="textred">
+                    {customHtmlRuleOptions.find(x => x.ruleId === rule.rule)?.optionValue}
+                  </span>
+                </div>
+              {/if}
+              {#if currSelectedCustomOption === index}
+                <div class="ml-5 mb-3">
+                  <div>
+                    {rule.customOptionsMessage}
+                  </div>
+                  <form on:submit|preventDefault={handleOnSubmit(rule)}>
+                    {#if rule.customOptionInputType === customOptionInputType.dropDown} 
+                      <select bind:value={customOptionInput}>
+                        {#each rule.customOptionDropdownValues as country}
+                          <option value={country.code}>
+                            {country.name} ({country.code})
+                          </option>
+                        {/each}
+                      </select>
+                    {/if}
+                    {#if rule.customOptionInputType === customOptionInputType.singleTextBox} 
+                      <input type={rule.customOptionInputValueType} on:input={(e) => customOptionInput = e.target.value} />
+                    {/if}
+                    {#if rule.customOptionInputType === customOptionInputType.multipleTextBoxes} 
+                      {#each multiInputValues as v, i}
+                        <div>
+                          <input id={i} type="text" bind:value={v}/>
+                          {#if multiInputValues.length > 1}
+                            <button
+                              class="textred px-2 py-1"
+                              style="border: none"
+                              on:click|preventDefault={() => removeField(i)}
+                            ><i class="fas fa-minus"></i></button>
+                          {/if}
+                        </div>
+                      {/each}
+                        <button
+                          class="textred px-2 py-1"
+                          style="border: none"
+                          on:click|preventDefault={() => addField()}
+                        >Add</button>
+                    {/if}
+                    <div class="py-2">
+                      <button
+                        class="text-white bgred px-2 py-1"
+                        type="submit"
+                      >Save</button>
+                      <button
+                        class="text-white bgdark px-2 py-1"
+                        on:click|preventDefault={() => {toggleCustomOption(-1)}}
+                        on:keypress={undefined}
+                      >Cancel</button>
+                      <button
+                        class="px-2 py-1"
+                        style="border: none"
+                        on:click|preventDefault={() => {addCustomRuleOptions('', rule)}}
+                        on:keypress={undefined}
+                      >Reset to default</button>
+                    </div>
+                  </form>
+                </div>
+              {/if}
+            </div>
+          {/if}
+        </div>
       {/each}
     {/if}
   {/if}
diff --git a/ui/src/components/summaryitemcomponents/CardSummary.svelte b/ui/src/components/summaryitemcomponents/CardSummary.svelte
index 95ebf030..e4aa1342 100644
--- a/ui/src/components/summaryitemcomponents/CardSummary.svelte
+++ b/ui/src/components/summaryitemcomponents/CardSummary.svelte
@@ -12,7 +12,7 @@
   export let value;
   export let isHtmlHintComp = false;
   export let isLighthouseAudit = false;
-
+  
   let showShareAlert;
   let previousScans = [];
   let sharedEmailAddresses = [];
@@ -86,7 +86,7 @@
       <button 
         type="button"
         class="bg-white hover:bg-gray-800 hover:text-white font-semibold py-2 px-4 border rounded"
-        on:click={navigateTo(`/scanCompare/${value.partitionKey}/${convertSpecialCharUrl(value.url)}/${value.buildDate}`)}
+        on:click={navigateTo(`/scanCompare/${value.apiKey || value.partitionKey}/${convertSpecialCharUrl(value.url)}/${value.buildDate}`)}
       >
         <i class="fas fa-code-compare"></i> 
         {previousScans[0].runId !== value.runId ? "Compare to latest scan" : "Compare to previous scan"}
diff --git a/ui/src/utils/countries.js b/ui/src/utils/countries.js
new file mode 100644
index 00000000..1e18e20a
--- /dev/null
+++ b/ui/src/utils/countries.js
@@ -0,0 +1,246 @@
+export const countryCodes =
+    [
+        {"name": "Afghanistan", "code": "AF"},
+        {"name": "Åland Islands", "code": "AX"},
+        {"name": "Albania", "code": "AL"},
+        {"name": "Algeria", "code": "DZ"},
+        {"name": "American Samoa", "code": "AS"},
+        {"name": "AndorrA", "code": "AD"},
+        {"name": "Angola", "code": "AO"},
+        {"name": "Anguilla", "code": "AI"},
+        {"name": "Antarctica", "code": "AQ"},
+        {"name": "Antigua and Barbuda", "code": "AG"},
+        {"name": "Argentina", "code": "AR"},
+        {"name": "Armenia", "code": "AM"},
+        {"name": "Aruba", "code": "AW"},
+        {"name": "Australia", "code": "AU"},
+        {"name": "Austria", "code": "AT"},
+        {"name": "Azerbaijan", "code": "AZ"},
+        {"name": "Bahamas", "code": "BS"},
+        {"name": "Bahrain", "code": "BH"},
+        {"name": "Bangladesh", "code": "BD"},
+        {"name": "Barbados", "code": "BB"},
+        {"name": "Belarus", "code": "BY"},
+        {"name": "Belgium", "code": "BE"},
+        {"name": "Belize", "code": "BZ"},
+        {"name": "Benin", "code": "BJ"},
+        {"name": "Bermuda", "code": "BM"},
+        {"name": "Bhutan", "code": "BT"},
+        {"name": "Bolivia", "code": "BO"},
+        {"name": "Bosnia and Herzegovina", "code": "BA"},
+        {"name": "Botswana", "code": "BW"},
+        {"name": "Bouvet Island", "code": "BV"},
+        {"name": "Brazil", "code": "BR"},
+        {"name": "British Indian Ocean Territory", "code": "IO"},
+        {"name": "Brunei Darussalam", "code": "BN"},
+        {"name": "Bulgaria", "code": "BG"},
+        {"name": "Burkina Faso", "code": "BF"},
+        {"name": "Burundi", "code": "BI"},
+        {"name": "Cambodia", "code": "KH"},
+        {"name": "Cameroon", "code": "CM"},
+        {"name": "Canada", "code": "CA"},
+        {"name": "Cape Verde", "code": "CV"},
+        {"name": "Cayman Islands", "code": "KY"},
+        {"name": "Central African Republic", "code": "CF"},
+        {"name": "Chad", "code": "TD"},
+        {"name": "Chile", "code": "CL"},
+        {"name": "China", "code": "CN"},
+        {"name": "Christmas Island", "code": "CX"},
+        {"name": "Cocos (Keeling) Islands", "code": "CC"},
+        {"name": "Colombia", "code": "CO"},
+        {"name": "Comoros", "code": "KM"},
+        {"name": "Congo", "code": "CG"},
+        {"name": "Congo, The Democratic Republic of the", "code": "CD"},
+        {"name": "Cook Islands", "code": "CK"},
+        {"name": "Costa Rica", "code": "CR"},
+        {"name": "Cote D\"Ivoire", "code": "CI"},
+        {"name": "Croatia", "code": "HR"},
+        {"name": "Cuba", "code": "CU"},
+        {"name": "Cyprus", "code": "CY"},
+        {"name": "Czech Republic", "code": "CZ"},
+        {"name": "Denmark", "code": "DK"},
+        {"name": "Djibouti", "code": "DJ"},
+        {"name": "Dominica", "code": "DM"},
+        {"name": "Dominican Republic", "code": "DO"},
+        {"name": "Ecuador", "code": "EC"},
+        {"name": "Egypt", "code": "EG"},
+        {"name": "El Salvador", "code": "SV"},
+        {"name": "Equatorial Guinea", "code": "GQ"},
+        {"name": "Eritrea", "code": "ER"},
+        {"name": "Estonia", "code": "EE"},
+        {"name": "Ethiopia", "code": "ET"},
+        {"name": "Falkland Islands (Malvinas)", "code": "FK"},
+        {"name": "Faroe Islands", "code": "FO"},
+        {"name": "Fiji", "code": "FJ"},
+        {"name": "Finland", "code": "FI"},
+        {"name": "France", "code": "FR"},
+        {"name": "French Guiana", "code": "GF"},
+        {"name": "French Polynesia", "code": "PF"},
+        {"name": "French Southern Territories", "code": "TF"},
+        {"name": "Gabon", "code": "GA"},
+        {"name": "Gambia", "code": "GM"},
+        {"name": "Georgia", "code": "GE"},
+        {"name": "Germany", "code": "DE"},
+        {"name": "Ghana", "code": "GH"},
+        {"name": "Gibraltar", "code": "GI"},
+        {"name": "Greece", "code": "GR"},
+        {"name": "Greenland", "code": "GL"},
+        {"name": "Grenada", "code": "GD"},
+        {"name": "Guadeloupe", "code": "GP"},
+        {"name": "Guam", "code": "GU"},
+        {"name": "Guatemala", "code": "GT"},
+        {"name": "Guernsey", "code": "GG"},
+        {"name": "Guinea", "code": "GN"},
+        {"name": "Guinea-Bissau", "code": "GW"},
+        {"name": "Guyana", "code": "GY"},
+        {"name": "Haiti", "code": "HT"},
+        {"name": "Heard Island and Mcdonald Islands", "code": "HM"},
+        {"name": "Holy See (Vatican City State)", "code": "VA"},
+        {"name": "Honduras", "code": "HN"},
+        {"name": "Hong Kong", "code": "HK"},
+        {"name": "Hungary", "code": "HU"},
+        {"name": "Iceland", "code": "IS"},
+        {"name": "India", "code": "IN"},
+        {"name": "Indonesia", "code": "ID"},
+        {"name": "Iran, Islamic Republic Of", "code": "IR"},
+        {"name": "Iraq", "code": "IQ"},
+        {"name": "Ireland", "code": "IE"},
+        {"name": "Isle of Man", "code": "IM"},
+        {"name": "Israel", "code": "IL"},
+        {"name": "Italy", "code": "IT"},
+        {"name": "Jamaica", "code": "JM"},
+        {"name": "Japan", "code": "JP"},
+        {"name": "Jersey", "code": "JE"},
+        {"name": "Jordan", "code": "JO"},
+        {"name": "Kazakhstan", "code": "KZ"},
+        {"name": "Kenya", "code": "KE"},
+        {"name": "Kiribati", "code": "KI"},
+        {"name": "Korea, Democratic People\"S Republic of", "code": "KP"},
+        {"name": "Korea, Republic of", "code": "KR"},
+        {"name": "Kuwait", "code": "KW"},
+        {"name": "Kyrgyzstan", "code": "KG"},
+        {"name": "Lao People\"S Democratic Republic", "code": "LA"},
+        {"name": "Latvia", "code": "LV"},
+        {"name": "Lebanon", "code": "LB"},
+        {"name": "Lesotho", "code": "LS"},
+        {"name": "Liberia", "code": "LR"},
+        {"name": "Libyan Arab Jamahiriya", "code": "LY"},
+        {"name": "Liechtenstein", "code": "LI"},
+        {"name": "Lithuania", "code": "LT"},
+        {"name": "Luxembourg", "code": "LU"},
+        {"name": "Macao", "code": "MO"},
+        {"name": "Macedonia, The Former Yugoslav Republic of", "code": "MK"},
+        {"name": "Madagascar", "code": "MG"},
+        {"name": "Malawi", "code": "MW"},
+        {"name": "Malaysia", "code": "MY"},
+        {"name": "Maldives", "code": "MV"},
+        {"name": "Mali", "code": "ML"},
+        {"name": "Malta", "code": "MT"},
+        {"name": "Marshall Islands", "code": "MH"},
+        {"name": "Martinique", "code": "MQ"},
+        {"name": "Mauritania", "code": "MR"},
+        {"name": "Mauritius", "code": "MU"},
+        {"name": "Mayotte", "code": "YT"},
+        {"name": "Mexico", "code": "MX"},
+        {"name": "Micronesia, Federated States of", "code": "FM"},
+        {"name": "Moldova, Republic of", "code": "MD"},
+        {"name": "Monaco", "code": "MC"},
+        {"name": "Mongolia", "code": "MN"},
+        {"name": "Montserrat", "code": "MS"},
+        {"name": "Morocco", "code": "MA"},
+        {"name": "Mozambique", "code": "MZ"},
+        {"name": "Myanmar", "code": "MM"},
+        {"name": "Namibia", "code": "NA"},
+        {"name": "Nauru", "code": "NR"},
+        {"name": "Nepal", "code": "NP"},
+        {"name": "Netherlands", "code": "NL"},
+        {"name": "Netherlands Antilles", "code": "AN"},
+        {"name": "New Caledonia", "code": "NC"},
+        {"name": "New Zealand", "code": "NZ"},
+        {"name": "Nicaragua", "code": "NI"},
+        {"name": "Niger", "code": "NE"},
+        {"name": "Nigeria", "code": "NG"},
+        {"name": "Niue", "code": "NU"},
+        {"name": "Norfolk Island", "code": "NF"},
+        {"name": "Northern Mariana Islands", "code": "MP"},
+        {"name": "Norway", "code": "NO"},
+        {"name": "Oman", "code": "OM"},
+        {"name": "Pakistan", "code": "PK"},
+        {"name": "Palau", "code": "PW"},
+        {"name": "Palestinian Territory, Occupied", "code": "PS"},
+        {"name": "Panama", "code": "PA"},
+        {"name": "Papua New Guinea", "code": "PG"},
+        {"name": "Paraguay", "code": "PY"},
+        {"name": "Peru", "code": "PE"},
+        {"name": "Philippines", "code": "PH"},
+        {"name": "Pitcairn", "code": "PN"},
+        {"name": "Poland", "code": "PL"},
+        {"name": "Portugal", "code": "PT"},
+        {"name": "Puerto Rico", "code": "PR"},
+        {"name": "Qatar", "code": "QA"},
+        {"name": "Reunion", "code": "RE"},
+        {"name": "Romania", "code": "RO"},
+        {"name": "Russian Federation", "code": "RU"},
+        {"name": "RWANDA", "code": "RW"},
+        {"name": "Saint Helena", "code": "SH"},
+        {"name": "Saint Kitts and Nevis", "code": "KN"},
+        {"name": "Saint Lucia", "code": "LC"},
+        {"name": "Saint Pierre and Miquelon", "code": "PM"},
+        {"name": "Saint Vincent and the Grenadines", "code": "VC"},
+        {"name": "Samoa", "code": "WS"},
+        {"name": "San Marino", "code": "SM"},
+        {"name": "Sao Tome and Principe", "code": "ST"},
+        {"name": "Saudi Arabia", "code": "SA"},
+        {"name": "Senegal", "code": "SN"},
+        {"name": "Serbia and Montenegro", "code": "CS"},
+        {"name": "Seychelles", "code": "SC"},
+        {"name": "Sierra Leone", "code": "SL"},
+        {"name": "Singapore", "code": "SG"},
+        {"name": "Slovakia", "code": "SK"},
+        {"name": "Slovenia", "code": "SI"},
+        {"name": "Solomon Islands", "code": "SB"},
+        {"name": "Somalia", "code": "SO"},
+        {"name": "South Africa", "code": "ZA"},
+        {"name": "South Georgia and the South Sandwich Islands", "code": "GS"},
+        {"name": "Spain", "code": "ES"},
+        {"name": "Sri Lanka", "code": "LK"},
+        {"name": "Sudan", "code": "SD"},
+        {"name": "Suriname", "code": "SR"},
+        {"name": "Svalbard and Jan Mayen", "code": "SJ"},
+        {"name": "Swaziland", "code": "SZ"},
+        {"name": "Sweden", "code": "SE"},
+        {"name": "Switzerland", "code": "CH"},
+        {"name": "Syrian Arab Republic", "code": "SY"},
+        {"name": "Taiwan", "code": "TW"},
+        {"name": "Tajikistan", "code": "TJ"},
+        {"name": "Tanzania, United Republic of", "code": "TZ"},
+        {"name": "Thailand", "code": "TH"},
+        {"name": "Timor-Leste", "code": "TL"},
+        {"name": "Togo", "code": "TG"},
+        {"name": "Tokelau", "code": "TK"},
+        {"name": "Tonga", "code": "TO"},
+        {"name": "Trinidad and Tobago", "code": "TT"},
+        {"name": "Tunisia", "code": "TN"},
+        {"name": "Turkey", "code": "TR"},
+        {"name": "Turkmenistan", "code": "TM"},
+        {"name": "Turks and Caicos Islands", "code": "TC"},
+        {"name": "Tuvalu", "code": "TV"},
+        {"name": "Uganda", "code": "UG"},
+        {"name": "Ukraine", "code": "UA"},
+        {"name": "United Arab Emirates", "code": "AE"},
+        {"name": "United Kingdom", "code": "GB"},
+        {"name": "United States", "code": "US"},
+        {"name": "United States Minor Outlying Islands", "code": "UM"},
+        {"name": "Uruguay", "code": "UY"},
+        {"name": "Uzbekistan", "code": "UZ"},
+        {"name": "Vanuatu", "code": "VU"},
+        {"name": "Venezuela", "code": "VE"},
+        {"name": "Viet Nam", "code": "VN"},
+        {"name": "Virgin Islands, British", "code": "VG"},
+        {"name": "Virgin Islands, U.S.", "code": "VI"},
+        {"name": "Wallis and Futuna", "code": "WF"},
+        {"name": "Western Sahara", "code": "EH"},
+        {"name": "Yemen", "code": "YE"},
+        {"name": "Zambia", "code": "ZM"},
+        {"name": "Zimbabwe", "code": "ZW"}
+    ]
\ No newline at end of file
diff --git a/ui/src/utils/utils.js b/ui/src/utils/utils.js
index e59215fc..621ce66a 100644
--- a/ui/src/utils/utils.js
+++ b/ui/src/utils/utils.js
@@ -21,6 +21,7 @@ import {
   prepend,
   __,
 } from "ramda";
+import { countryCodes } from "./countries";
 
 export const truncate = (len) =>
   when(
@@ -360,6 +361,12 @@ export const historyChartType = {
   ErrorCode: "CODE ERRORS",
 }
 
+export const customOptionInputType = {
+  dropDown: "dropDown",
+  singleTextBox: "singleTextBox",
+  multipleTextBoxes: "multipleTextBoxes",
+};
+
 export const htmlHintRules = [
   {
     rule: "tagname-lowercase",
@@ -536,7 +543,10 @@ export const customHtmlHintRules = [
     rule: "common-spelling-mistakes",
     displayName: "Content - Avoid common spelling and syntax mistakes",
     ruleLink: "https://www.ssw.com.au/rules/avoid-common-mistakes",
-    type: RuleType.Warning
+    type: RuleType.Warning,
+    isEnableCustomOptions: true,
+    customOptionsMessage: 'Please enter the terms to be reported:',
+    customOptionInputType: customOptionInputType.multipleTextBoxes,
   },
   {
     rule: "page-must-not-show-email-addresses",
@@ -548,7 +558,11 @@ export const customHtmlHintRules = [
     rule: "phone-numbers-without-links",
     displayName: "Content - Phone numbers must be in hyperlinks",
     ruleLink: "https://www.ssw.com.au/rules/do-you-know-to-hyperlink-your-phone-numbers",
-    type: RuleType.Warning
+    type: RuleType.Warning,
+    isEnableCustomOptions: true,
+    customOptionsMessage: 'Please choose your country code:',
+    customOptionInputType: customOptionInputType.dropDown,
+    customOptionDropdownValues: countryCodes
   },
   {
     rule: "use-unicode-hex-code-for-special-html-characters",
@@ -572,7 +586,11 @@ export const customHtmlHintRules = [
     rule: "detect-absolute-references-url-path-correctly",
     displayName: "Links - Avoid absolute internal URLs",
     ruleLink: "https://ssw.com.au/rules/avoid-absolute-internal-links/",
-    type: RuleType.Warning
+    type: RuleType.Warning,
+    isEnableCustomOptions: true,
+    customOptionsMessage: 'Please enter your website internal URL:',
+    customOptionInputType: customOptionInputType.singleTextBox,
+    customOptionInputValueType: 'url'
   },
   {
     rule: "url-must-not-have-space",