diff --git a/popup.css b/popup.css
index ea6b93f..9617107 100644
--- a/popup.css
+++ b/popup.css
@@ -17,6 +17,11 @@ input[type="text"].display, input[type="text"].display:active, input[type="text"
     width: 100%;
 }
 
+select {
+    text-align: left !important;
+}
+
+
 .cursor-default {
     cursor: default;
 }
diff --git a/popup.dist.js b/popup.dist.js
index ce27db1..3891f7f 100644
--- a/popup.dist.js
+++ b/popup.dist.js
@@ -3,4 +3,4 @@
   * Copyright 2024-2024 Ray Lam (https://www.hiimray.co.uk)
   *
   */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.PejiInspektor=t():e.PejiInspektor=t()}(this,(()=>(()=>{var e={645:function(e){var t;t=()=>(()=>{var e={814:()=>{Array.isEmpty=function(e){return"array"!=Object.getDataType(e)||e.length<=0},Array.toFlatten=function(e,t,n){for(let r=0;r<e.length;r++)n.push(e[r]),null!=typeof e[r][t]&&e[r][t].length>0&&Array.toFlatten(e[r][t],t,n)},Array.prototype.addRange=function(e){return null==e||e.forEach((e=>{this.push(e)})),this},Array.prototype.all=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]!=t)return!1}else if(void 0!==this[n][e]&&this[n][e]!=t)return!1;return!0},Array.prototype.any=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]==t)return!0}else if(void 0!==this[n][e]&&this[n][e]==t)return!0;return!1},Array.prototype.copy=function(){return JSON.parse(JSON.stringify(this))},Array.prototype.count=function(e,t){let n=0;for(let r=0;r<this.length;r++)null==e?this[r]==t&&n++:void 0!==this[r][e]&&this[r][e]==t&&n++;return n},Array.prototype.countMany=function(...e){let t=0;return e.forEach((e=>{t+=this.count(e.propName,e.value)})),t},Array.prototype.create=function(e,t){let n=[];for(let r=0;r<e;r++)n.push(t);return n},Array.prototype.distinct=function(){return this.filter(((e,t,n)=>t===n.findIndex((t=>JSON.stringify(t)===JSON.stringify(e)))))},Array.prototype.flatten=function(e){let t=[];return Array.toFlatten(this,e,t),t},Array.prototype.get=function(e){return e<0||e>=this.length?"":this[e]},Array.prototype.index=function(e,t){const n=this.indexes(e,t);return n.length<=0?null:n[0]},Array.prototype.indexes=function(e,t){let n=[];for(let r=0;r<this.length;r++)null==e?this[r]==t&&n.push(r):void 0!==this[r][e]&&this[r][e]==t&&n.push(r);return n},Array.prototype.insert=function(e,t){return e<0?this.splice(0,0,t):e>=this.length?this.push(t):this.splice(e,0,t),this},Array.prototype.joinIfNotNullOrWhitespace=function(e){let t="";for(let n=0;n<this.length;n++)String.isNullOrWhitespace(this[n])||(String.isNullOrWhitespace(t)||(t+=e),t+=this[n]);return t},Array.prototype.first=function(e,t){for(let n=0;n<this.length;n++)if(void 0!==this[n][e]&&this[n][e]==t)return this[n];return null},Array.prototype.forEachTree=function(e,t){for(let n=0;n<this.length;n++){if(!1===t(this[n]))return;if(!(this[n][e].length<=0)&&!1===this[n][e].forEachTree(e,t))return}},Array.prototype.orderBy=function(e){return this.sort((function(t,n){return t[e]<n[e]?-1:t[e]>n[e]?1:0})),this},Array.prototype.orderByDesc=function(e){return this.sort((function(t,n){return t[e]<n[e]?1:t[e]>n[e]?-1:0})),this},Array.prototype.remove=function(e){let t=[];for(let n=0;n<this.length;n++)this[n]==e&&t.push(n);for(let e=t.length-1;e>=0;e--)this.removeAt(t[e]);return this},Array.prototype.removeAt=function(e){return e<0||e>=this.length||this.splice(e,1),this},Array.prototype.removeRange=function(e){for(let t=0;t<e.length;t++)this.remove(e[t]);return this},Array.prototype.notSelect=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]!=t&&n.push(this[r]);return n},Array.prototype.select=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]==t&&n.push(this[r]);return n},Array.prototype.selectMany=function(...e){let t=this;return e.forEach((e=>{t=t.select(e.propName,e.value)})),t},Array.prototype.toList=function(e){let t=[];return this.forEach((n=>{null!=typeof n[e]&&t.push(n[e])})),t},Array.prototype.sortTree=function(e,t){this.orderBy(t);for(let n=0;n<this.length;n++)this[n][e].length<=0||this[n][e].orderBy(t)}},523:()=>{Boolean.isFalse=function(e){return!!String.isNullOrUndefined(e)||e.toString().containsCI("false","f","y","0","x")},Boolean.isTrue=function(e){return!String.isNullOrUndefined(e)&&e.toString().containsCI("true","t","n","1","o")},Boolean.ifTrue=function(e,t,n){return Boolean.isTrue(e)?t:n}},579:()=>{Date.addDays=function(e,t){let n=new Date(e);return n.addDays(t),n},Date.addMonths=function(e,t){let n=new Date(e);return n.addMonths(t),n},Date.addYears=function(e,t){let n=new Date(e);return n.addYears(t),n},Date.max=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(t):new Date(e)},Date.min=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(e):new Date(t)},Date.diffDays=function(e,t){return Math.ceil((new Date(t).getTime()-new Date(e).getTime())/864e5)},Date.today=function(){let e=new Date;return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e},Date.prototype.addDays=function(e){this.setDate(this.getDate()+parseInt(e))},Date.prototype.addMonths=function(e){this.setMonth(this.getMonth()+parseInt(e))},Date.prototype.addYears=function(e){this.setFullYear(this.getFullYear()+parseInt(e))},Date.prototype.toCString=function(e){let t=e;return t=t.replace("fffffff",this.getMilliseconds().toString().padStart(7,"0")),t=t.replace("ffffff",this.getMilliseconds().toString().padStart(6,"0")),t=t.replace("fffff",this.getMilliseconds().toString().padStart(5,"0")),t=t.replace("yyyy",this.getFullYear().toString().padStart(4,"0")),t=t.replace("MMMM","{1}"),t=t.replace("dddd","{2}"),t=t.replace("ffff",this.getMilliseconds().toString().padStart(4,"0")),t=t.replace("yyy",this.getFullYear().toString().padStart(3,"0")),t=t.replace("MMM","{3}"),t=t.replace("ddd","{4}"),t=t.replace("fff",this.getMilliseconds().toString().padStart(3,"0")),t=t.replace("zzz",""),t=t.replace("yy",this.getFullYear().toString().slice(-2)),t=t.replace("MM",(this.getMonth()+1).toString().padStart(2,"0")),t=t.replace("dd",this.getDate().toString().padStart(2,"0")),t=t.replace("HH",this.getHours().toString().padStart(2,"0")),t=t.replace("hh",(this.getHours()>12?this.getHours()-12:this.getHours()).toString().padStart(2,"0")),t=t.replace("mm",this.getMinutes().toString().padStart(2,"0")),t=t.replace("ss",this.getSeconds().toString().padStart(2,"0")),t=t.replace("ff",this.getMilliseconds().toString().padStart(2,"0")),t=t.replace("tt","{5}"),t=t.replace("zz",""),t=t.replace("y",this.getFullYear().toString()),t=t.replace("M",(this.getMonth()+1).toString()),t=t.replace("d",this.getDate().toString()),t=t.replace("H",this.getHours().toString()),t=t.replace("h",(this.getHours()>12?this.getHours()-12:this.getHours()).toString()),t=t.replace("m",this.getMinutes().toString()),t=t.replace("s",this.getSeconds().toString()),t=t.replace("z",""),t=t.replace("t","{6}"),t=t.replace("Z",""),t=t.replace("{1}",this.toLocaleString("default",{month:"long"})),t=t.replace("{2}",this.toLocaleString("default",{weekday:"long"})),t=t.replace("{3}",this.toLocaleString("default",{month:"short"})),t=t.replace("{4}",this.toLocaleString("default",{weekday:"short"})),t=t.replace("{5}",this.getHours()>=12?"PM":"AM"),t=t.replace("{6}",this.getHours()>=12?"P":"A"),t}},874:()=>{Document.ready=async function(e){!async function(){"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",(function(){e()}))}()},Document.getWidth=function(e){return null==e||void 0===e?0:e.offsetWidth||e.innerWidth||e.clientWidth},Document.getHeight=function(e){return null==e||void 0===e?0:e.offsetHeight||e.innerHeight||e.clientHeight},Document.appendHtml=function(e,t){const n=document.createElement(t);e.appendChild(n)},Document.addClass=function(e,t){e.classList.contains(t)||e.classList.add(t)},Document.removeClass=function(e,t){e.classList.contains(t)&&e.classList.remove(t)}},705:()=>{Math.randomN=function(e,t){return e=Math.ceil(e),t=Math.floor(t),Math.floor(Math.random()*(t-e)+e)},Math.average=function(e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.avg=function(...e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.half=function(e){return e/2}},428:()=>{Object.isNullOrUndefined=function(e){return void 0===e||null==e},Object.getDataType=function(e){return String.isNullOrUndefined(e)?"null":"object"==typeof e?Array.isArray(e)?"array":"object":typeof e}},930:()=>{String.isNullOrUndefined=function(e){return void 0===e||null==e},String.isNullOrWhitespace=function(e){return!!String.isNullOrUndefined(e)||("string"==typeof e?e.trim().length<=0:e.toString().trim().length<=0)},String.joinIfNotNullOrWhitespace=function(e,...t){let n="";for(let r=0;r<t.length;r++)String.isNullOrWhitespace(t[r])||(String.isNullOrWhitespace(n)||(n+=e),n+=t[r]);return n},String.prototype.contains=function(...e){for(let t of e)if(this==t)return!0;return!1},String.prototype.containsCI=function(...e){for(let t of e)if(this.toLowerCase()==t.toLowerCase())return!0;return!1},String.prototype.encodeHtmlLinks=function(){return value.replace(/(http[s]{0,1}:\/\/[^\s]+)/g,"<a href='$1'>$1</a>")},String.prototype.toTitleCase=function(){let e=this;return e=e.replace(/([A-Z]{1})/g," $1"),e=e.trim(),e=e.charAt(0).toUpperCase()+e.substr(1),e},String.prototype.getFilename=function(){return this.substring(this.lastIndexOf("/")+1)}},323:()=>{Window.goToTop=function(){Window.scrollTo(0,0)},Window.fragment={get:function(){if(!window.location.hash)return null;const e=window.location.hash.indexOf("?");return e<0?window.location.hash.substring(1):window.location.hash.substring(1,e)},getQuery:function(){if(!window.location.hash)return null;let e=window.location.hash;const t=e.indexOf("?");if(t<0)return null;e=hasQueryString.substring(t+1);const n=new URLSearchParams(e),r={};for(const[e,t]of n.entries())r[e]=t;return r},clear:function(){location.hash="",history.replaceState("","",location.pathname)}}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var r={};return(()=>{"use strict";n.r(r),n(814),n(523),n(579),n(874),n(705),n(428),n(930),n(323)})(),r})(),e.exports=t()}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,n),i.exports}return(()=>{"use strict";n(645);const e=class{GenerateCheckBox(e,t,n){let r="";return r+='<div class="form-check form-switch">',r+='<input class="form-check-input" type="checkbox" role="switch" id="checkbox'+e+'" '+(n?"checked":"")+">",r+='<label class="form-check-label" for="checkbox'+e+'">'+t+"</label>",r+="</div>",r}GenerateCols(...e){let t="";for(let n=0;n<e.length;n++)t+='<div class="col">'+e[n]+"</div>";return t}GenerateCSVLine(e,...t){1===t.length&&"array"==Object.getDataType(t[0])&&(t=t[0]);let n="";for(let r=0;r<t.length;r++)r>0&&(n+=e),n+=t[r];return n}GenerateRadioBox(e,t,n,r,o){let i="";return i+='<div class="form-check">',i+='<input class="form-check-input" type="radio" name="radioGroup'+e+'" id="radioBox'+t+'" value="'+r+'" '+(o?"checked":"")+">",i+='<label class="form-check-label" for="radioBox'+t+'">'+n+"</label>",i+="</div>",i}GenerateRow(...e){const t=this;1===e.length&&"array"==Object.getDataType(e[0])&&(e=e[0]);let n="";for(let r=0;r<e.length;r++)n+=t.GenerateRowCell(e[r]);return"<tr>"+n+"</tr>"}GenerateRowCell(e){return'<td class=""><input type="text" class="display" readonly="readonly" value="'+e+'" /></td>'}SetHtml(e,t){null!=e&&(e.innerHTML=t)}},t=new class extends e{#e=null;#t=null;constructor(e){super(),this.#t=e}InitialiseComponents(){const e=this;e.Clear(),e.#n(),e.#r(),e.Button1.addEventListener("click",(async function(t){e.Button2.disabled=!0,e.TextBox1.value="",await e.Search(),e.Button2.disabled=!1})),e.Button2.addEventListener("click",(async function(t){e.Button2.disabled=!0,await e.Search(),e.Button2.disabled=!1}))}#n(){const e=this;let t="";t+=e.GenerateCheckBox(1,"Show Anchor as HTML",!1),t+=e.GenerateCheckBox(4,"Resolve Relative URL",!1);let n="";n+=e.GenerateCheckBox(3,"Sort By Anchor Text",!0),n+=e.GenerateCheckBox(2,"Trim Anchor Text",!0);let r=e.GenerateCols(t,n,"");e.SetHtml(e.Panel1,r)}#r(){const e=this;let t="";t+=e.GenerateCheckBox(12,"Hide External Links",!0),t+=e.GenerateCheckBox(5,"Hide Duplicates",!0),t+=e.GenerateCheckBox(14,"Hide Blank Anchors",!0),t+=e.GenerateCheckBox(15,"Hide Blank Links",!0);let n="";n+=e.GenerateCheckBox(11,"Hide Fragments",!0),n+=e.GenerateCheckBox(13,"Hide Mailto/Tel",!0),n+=e.GenerateCheckBox(16,"Hide Javascript",!0);let r="";r+=e.GenerateCheckBox(6,"Show Title",!0),r+=e.GenerateCheckBox(7,"Show Target",!1),r+=e.GenerateCheckBox(8,"Show Rel",!1),r+=e.GenerateCheckBox(9,"Show Type",!1),r+=e.GenerateCheckBox(10,"Show Count",!1);let o=e.GenerateCols(t,n,r);e.SetHtml(e.Panel2,o)}get Button1(){return null==this.Container?null:this.Container.querySelectorAll("button")[0]}get Button2(){return null==this.Container?null:this.Container.querySelectorAll("button")[1]}get Container(){const e=this;return null==e.#e&&(e.#e=document.getElementById("nav-hyperlinks")),e.#e}get Label1(){return null==this.Container?null:this.Container.querySelectorAll("span[role='label']")[0]}get MemoBox1(){return null==this.Container?null:this.Container.querySelectorAll("textarea")[0]}get Panel1(){return null==this.Container?null:this.Container.querySelectorAll("div[role='options']")[0]}get Panel2(){return null==this.Container?null:this.Container.querySelectorAll("div[role='filters']")[0]}get Table1(){return null==this.Container?null:this.Container.querySelectorAll("table")[0]}get TextBox1(){return null==this.Container?null:this.Container.querySelectorAll("input[role='textbox']")[0]}Clear(){const e=this;e.Table1.style.display="none",e.MemoBox1.style.display="none",e.SetHtml(e.Panel1,""),e.SetHtml(e.Panel2,"")}async Search(){const e=this;e.Label1.innerText="",e.Table1.style.display="none",e.MemoBox1.style.display="none";const t=await e.#t.GetHyperlinks(),n=t.length,r=await e.#o(t.copy());switch(r.length==n?e.Label1.innerText="Showing "+n+" result"+(1==n?"":"s"):e.Label1.innerText="Showing "+r.length+" of "+n+" result"+(1==n?"":"s"),e.#i(2)){case"table":e.#l(r);break;case"csv":e.#a(r);break;case"links":e.#s(r)}}async#o(e){const t=this,n=await t.#t.GetLocation(),r=new URL(n).hostname,o=t.#i(1);let i=[];for(let l=0;l<e.length;l++){const a=e[l];if(t.#c(11)&&a.href.startsWith("#"))continue;if(t.#c(15)&&String.isNullOrWhitespace(a.href))continue;if(t.#c(13)&&(a.href.toLowerCase().startsWith("telno:")||a.href.toLowerCase().startsWith("mailto:")))continue;if(t.#c(16)&&a.href.toLowerCase().startsWith("javascript:"))continue;const s=new URL(a.href,n);if(t.#c(12)&&r!=s.hostname)continue;let c=t.#c(1)?a.innerHTML:a.innerText;if(t.#c(14)&&String.isNullOrWhitespace(c))continue;const u=t.#c(4)?s.href:a.href;if(t.#c(2)&&(c=c.trim()),!String.isNullOrWhitespace(t.TextBox1.value))if("anchor"==o.value){if(!c.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue}else if(!u.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue;i.push({text:c,href:u,title:t.#c(6)?a.title:"",target:t.#c(7)?a.target:"",rel:t.#c(8)?a.rel:"",type:t.#c(9)?a.type:"",occurrence:""})}if(t.#c(10)){let e=[];for(let t=0;t<i.length;t++){const n=i.filter((e=>JSON.stringify(e)===JSON.stringify(i[t]))).length;e.push(n)}for(let t=0;t<i.length;t++)i[t].occurrence=e[t]}return t.#c(5)&&(i=i.distinct()),t.#c(3)&&(i=i.orderBy("text")),i}#u(){const e=this,t=[{id:6,name:"Title"},{id:7,name:"Target"},{id:8,name:"Rel"},{id:9,name:"Type"},{id:10,name:"Count"}];let n="";n+="<th>Anchor Text</th>",n+="<th>Address</th>";for(let r=0;r<t.length;r++)e.#c(t[r].id)&&(n+="<th>"+t[r].name+"</th>");return n}#c(e){if(null==this.Container)return!1;const t=this.Container.querySelectorAll("input[id='checkbox"+e+"']");return!(t.length<=0)&&t[0].checked}#i(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("input[name='radioGroup"+e+"']:checked");return t.length<=0?"":t[0].value}#l(e){const t=this,n=t.Table1.querySelectorAll("thead")[0],r=t.Table1.querySelectorAll("tbody")[0];n.innerHTML="",r.innerHTML="",t.Table1.style.display="table",n.innerHTML="<tr>"+t.#u()+"</tr>";for(let n=0;n<e.length;n++){const o=e[n];let i=[o.text,o.href];t.#c(6)&&i.push(o.title),t.#c(7)&&i.push(o.target),t.#c(8)&&i.push(o.rel),t.#c(9)&&i.push(o.type),t.#c(10)&&i.push(o.occurrence),r.innerHTML+=t.GenerateRow(i)}}#a(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];let o=[r.text,r.href];t.#c(6)&&o.push(r.title),t.#c(7)&&o.push(r.target),t.#c(8)&&o.push(r.rel),t.#c(9)&&o.push(r.type),t.#c(10)&&o.push(r.occurrence),t.MemoBox1.value+=t.GenerateCSVLine("\t",o),t.MemoBox1.value+="\n"}}#s(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];t.MemoBox1.value+=t.GenerateCSVLine("\t",[r.href]),t.MemoBox1.value+="\n"}}}(new class{async SendMessage(e,t){chrome.tabs.query({active:!0,currentWindow:!0},(function(n){chrome.tabs.sendMessage(n[0].id,{event:e},t)}))}async GetHyperlinks(){const e=this;return await e.GetLocation(),new Promise((function(t){e.SendMessage("GetNodes",(async function(e){t(e.copy())}))}))}async GetLocation(){const e=this;return new Promise((function(t){e.SendMessage("GetLocation",(function(e){t(e)}))}))}});document.addEventListener("DOMContentLoaded",(async function(e){t.InitialiseComponents()}))})(),{}})()));
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.PejiInspektor=t():e.PejiInspektor=t()}(this,(()=>(()=>{var e={645:function(e){var t;t=()=>(()=>{var e={814:()=>{Array.isEmpty=function(e){return"array"!=Object.getDataType(e)||e.length<=0},Array.toFlatten=function(e,t,n){for(let r=0;r<e.length;r++)n.push(e[r]),null!=typeof e[r][t]&&e[r][t].length>0&&Array.toFlatten(e[r][t],t,n)},Array.prototype.addRange=function(e){return null==e||e.forEach((e=>{this.push(e)})),this},Array.prototype.all=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]!=t)return!1}else if(void 0!==this[n][e]&&this[n][e]!=t)return!1;return!0},Array.prototype.any=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]==t)return!0}else if(void 0!==this[n][e]&&this[n][e]==t)return!0;return!1},Array.prototype.copy=function(){return JSON.parse(JSON.stringify(this))},Array.prototype.count=function(e,t){let n=0;for(let r=0;r<this.length;r++)null==e?this[r]==t&&n++:void 0!==this[r][e]&&this[r][e]==t&&n++;return n},Array.prototype.countMany=function(...e){let t=0;return e.forEach((e=>{t+=this.count(e.propName,e.value)})),t},Array.prototype.create=function(e,t){let n=[];for(let r=0;r<e;r++)n.push(t);return n},Array.prototype.distinct=function(){return this.filter(((e,t,n)=>t===n.findIndex((t=>JSON.stringify(t)===JSON.stringify(e)))))},Array.prototype.flatten=function(e){let t=[];return Array.toFlatten(this,e,t),t},Array.prototype.get=function(e){return e<0||e>=this.length?"":this[e]},Array.prototype.index=function(e,t){const n=this.indexes(e,t);return n.length<=0?null:n[0]},Array.prototype.indexes=function(e,t){let n=[];for(let r=0;r<this.length;r++)null==e?this[r]==t&&n.push(r):void 0!==this[r][e]&&this[r][e]==t&&n.push(r);return n},Array.prototype.insert=function(e,t){return e<0?this.splice(0,0,t):e>=this.length?this.push(t):this.splice(e,0,t),this},Array.prototype.joinIfNotNullOrWhitespace=function(e){let t="";for(let n=0;n<this.length;n++)String.isNullOrWhitespace(this[n])||(String.isNullOrWhitespace(t)||(t+=e),t+=this[n]);return t},Array.prototype.first=function(e,t){for(let n=0;n<this.length;n++)if(void 0!==this[n][e]&&this[n][e]==t)return this[n];return null},Array.prototype.forEachTree=function(e,t){for(let n=0;n<this.length;n++){if(!1===t(this[n]))return;if(!(this[n][e].length<=0)&&!1===this[n][e].forEachTree(e,t))return}},Array.prototype.orderBy=function(e){return this.sort((function(t,n){return t[e]<n[e]?-1:t[e]>n[e]?1:0})),this},Array.prototype.orderByDesc=function(e){return this.sort((function(t,n){return t[e]<n[e]?1:t[e]>n[e]?-1:0})),this},Array.prototype.remove=function(e){let t=[];for(let n=0;n<this.length;n++)this[n]==e&&t.push(n);for(let e=t.length-1;e>=0;e--)this.removeAt(t[e]);return this},Array.prototype.removeAt=function(e){return e<0||e>=this.length||this.splice(e,1),this},Array.prototype.removeRange=function(e){for(let t=0;t<e.length;t++)this.remove(e[t]);return this},Array.prototype.notSelect=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]!=t&&n.push(this[r]);return n},Array.prototype.select=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]==t&&n.push(this[r]);return n},Array.prototype.selectMany=function(...e){let t=this;return e.forEach((e=>{t=t.select(e.propName,e.value)})),t},Array.prototype.toList=function(e){let t=[];return this.forEach((n=>{null!=typeof n[e]&&t.push(n[e])})),t},Array.prototype.sortTree=function(e,t){this.orderBy(t);for(let n=0;n<this.length;n++)this[n][e].length<=0||this[n][e].orderBy(t)}},523:()=>{Boolean.isFalse=function(e){return!!String.isNullOrUndefined(e)||e.toString().containsCI("false","f","y","0","x")},Boolean.isTrue=function(e){return!String.isNullOrUndefined(e)&&e.toString().containsCI("true","t","n","1","o")},Boolean.ifTrue=function(e,t,n){return Boolean.isTrue(e)?t:n}},579:()=>{Date.addDays=function(e,t){let n=new Date(e);return n.addDays(t),n},Date.addMonths=function(e,t){let n=new Date(e);return n.addMonths(t),n},Date.addYears=function(e,t){let n=new Date(e);return n.addYears(t),n},Date.max=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(t):new Date(e)},Date.min=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(e):new Date(t)},Date.diffDays=function(e,t){return Math.ceil((new Date(t).getTime()-new Date(e).getTime())/864e5)},Date.today=function(){let e=new Date;return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e},Date.prototype.addDays=function(e){this.setDate(this.getDate()+parseInt(e))},Date.prototype.addMonths=function(e){this.setMonth(this.getMonth()+parseInt(e))},Date.prototype.addYears=function(e){this.setFullYear(this.getFullYear()+parseInt(e))},Date.prototype.toCString=function(e){let t=e;return t=t.replace("fffffff",this.getMilliseconds().toString().padStart(7,"0")),t=t.replace("ffffff",this.getMilliseconds().toString().padStart(6,"0")),t=t.replace("fffff",this.getMilliseconds().toString().padStart(5,"0")),t=t.replace("yyyy",this.getFullYear().toString().padStart(4,"0")),t=t.replace("MMMM","{1}"),t=t.replace("dddd","{2}"),t=t.replace("ffff",this.getMilliseconds().toString().padStart(4,"0")),t=t.replace("yyy",this.getFullYear().toString().padStart(3,"0")),t=t.replace("MMM","{3}"),t=t.replace("ddd","{4}"),t=t.replace("fff",this.getMilliseconds().toString().padStart(3,"0")),t=t.replace("zzz",""),t=t.replace("yy",this.getFullYear().toString().slice(-2)),t=t.replace("MM",(this.getMonth()+1).toString().padStart(2,"0")),t=t.replace("dd",this.getDate().toString().padStart(2,"0")),t=t.replace("HH",this.getHours().toString().padStart(2,"0")),t=t.replace("hh",(this.getHours()>12?this.getHours()-12:this.getHours()).toString().padStart(2,"0")),t=t.replace("mm",this.getMinutes().toString().padStart(2,"0")),t=t.replace("ss",this.getSeconds().toString().padStart(2,"0")),t=t.replace("ff",this.getMilliseconds().toString().padStart(2,"0")),t=t.replace("tt","{5}"),t=t.replace("zz",""),t=t.replace("y",this.getFullYear().toString()),t=t.replace("M",(this.getMonth()+1).toString()),t=t.replace("d",this.getDate().toString()),t=t.replace("H",this.getHours().toString()),t=t.replace("h",(this.getHours()>12?this.getHours()-12:this.getHours()).toString()),t=t.replace("m",this.getMinutes().toString()),t=t.replace("s",this.getSeconds().toString()),t=t.replace("z",""),t=t.replace("t","{6}"),t=t.replace("Z",""),t=t.replace("{1}",this.toLocaleString("default",{month:"long"})),t=t.replace("{2}",this.toLocaleString("default",{weekday:"long"})),t=t.replace("{3}",this.toLocaleString("default",{month:"short"})),t=t.replace("{4}",this.toLocaleString("default",{weekday:"short"})),t=t.replace("{5}",this.getHours()>=12?"PM":"AM"),t=t.replace("{6}",this.getHours()>=12?"P":"A"),t}},874:()=>{Document.ready=async function(e){!async function(){"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",(function(){e()}))}()},Document.getWidth=function(e){return null==e||void 0===e?0:e.offsetWidth||e.innerWidth||e.clientWidth},Document.getHeight=function(e){return null==e||void 0===e?0:e.offsetHeight||e.innerHeight||e.clientHeight},Document.appendHtml=function(e,t){const n=document.createElement(t);e.appendChild(n)},Document.addClass=function(e,t){e.classList.contains(t)||e.classList.add(t)},Document.removeClass=function(e,t){e.classList.contains(t)&&e.classList.remove(t)}},705:()=>{Math.randomN=function(e,t){return e=Math.ceil(e),t=Math.floor(t),Math.floor(Math.random()*(t-e)+e)},Math.average=function(e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.avg=function(...e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.half=function(e){return e/2}},428:()=>{Object.isNullOrUndefined=function(e){return void 0===e||null==e},Object.getDataType=function(e){return String.isNullOrUndefined(e)?"null":"object"==typeof e?Array.isArray(e)?"array":"object":typeof e}},930:()=>{String.isNullOrUndefined=function(e){return void 0===e||null==e},String.isNullOrWhitespace=function(e){return!!String.isNullOrUndefined(e)||("string"==typeof e?e.trim().length<=0:e.toString().trim().length<=0)},String.joinIfNotNullOrWhitespace=function(e,...t){let n="";for(let r=0;r<t.length;r++)String.isNullOrWhitespace(t[r])||(String.isNullOrWhitespace(n)||(n+=e),n+=t[r]);return n},String.prototype.contains=function(...e){for(let t of e)if(this==t)return!0;return!1},String.prototype.containsCI=function(...e){for(let t of e)if(this.toLowerCase()==t.toLowerCase())return!0;return!1},String.prototype.encodeHtmlLinks=function(){return value.replace(/(http[s]{0,1}:\/\/[^\s]+)/g,"<a href='$1'>$1</a>")},String.prototype.toTitleCase=function(){let e=this;return e=e.replace(/([A-Z]{1})/g," $1"),e=e.trim(),e=e.charAt(0).toUpperCase()+e.substr(1),e},String.prototype.getFilename=function(){return this.substring(this.lastIndexOf("/")+1)}},323:()=>{Window.goToTop=function(){Window.scrollTo(0,0)},Window.fragment={get:function(){if(!window.location.hash)return null;const e=window.location.hash.indexOf("?");return e<0?window.location.hash.substring(1):window.location.hash.substring(1,e)},getQuery:function(){if(!window.location.hash)return null;let e=window.location.hash;const t=e.indexOf("?");if(t<0)return null;e=hasQueryString.substring(t+1);const n=new URLSearchParams(e),r={};for(const[e,t]of n.entries())r[e]=t;return r},clear:function(){location.hash="",history.replaceState("","",location.pathname)}}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var r={};return(()=>{"use strict";n.r(r),n(814),n(523),n(579),n(874),n(705),n(428),n(930),n(323)})(),r})(),e.exports=t()}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,n),i.exports}return(()=>{"use strict";n(645);const e=class{GenerateCheckBox(e,t,n){let r="";return r+='<div class="form-check form-switch">',r+='<input class="form-check-input" type="checkbox" role="switch" id="checkbox'+e+'" '+(n?"checked":"")+">",r+='<label class="form-check-label" for="checkbox'+e+'">'+t+"</label>",r+="</div>",r}GenerateCols(...e){let t="";for(let n=0;n<e.length;n++)t+='<div class="col">'+e[n]+"</div>";return t}GenerateCSVLine(e,...t){1===t.length&&"array"==Object.getDataType(t[0])&&(t=t[0]);let n="";for(let r=0;r<t.length;r++)r>0&&(n+=e),n+=t[r];return n}GenerateRadioBox(e,t,n,r,o){let i="";return i+='<div class="form-check">',i+='<input class="form-check-input" type="radio" name="radioGroup'+e+'" id="radioBox'+t+'" value="'+r+'" '+(o?"checked":"")+">",i+='<label class="form-check-label" for="radioBox'+t+'">'+n+"</label>",i+="</div>",i}GenerateRow(...e){const t=this;1===e.length&&"array"==Object.getDataType(e[0])&&(e=e[0]);let n="";for(let r=0;r<e.length;r++)n+=t.GenerateRowCell(e[r]);return"<tr>"+n+"</tr>"}GenerateRowCell(e){return'<td class=""><input type="text" class="display" readonly="readonly" value="'+e+'" /></td>'}SetHtml(e,t){null!=e&&(e.innerHTML=t)}},t=new class extends e{#e=null;#t=null;constructor(e){super(),this.#t=e}InitialiseComponents(){const e=this;e.Clear(),e.#n(),e.#r(),e.Button1.addEventListener("click",(async function(t){e.Button2.disabled=!0,e.TextBox1.value="",await e.Search(),e.Button2.disabled=!1})),e.Button2.addEventListener("click",(async function(t){e.Button2.disabled=!0,await e.Search(),e.Button2.disabled=!1}))}#n(){const e=this;let t="";t+=e.GenerateCheckBox(1,"Show Anchor as HTML",!1),t+=e.GenerateCheckBox(4,"Resolve Relative URL",!1);let n="";n+=e.GenerateCheckBox(3,"Sort By Anchor Text",!0),n+=e.GenerateCheckBox(2,"Trim Anchor Text",!0);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel1,r)}#r(){const e=this;let t="";t+=e.GenerateCheckBox(12,"Hide External Links",!0),t+=e.GenerateCheckBox(5,"Hide Duplicates",!0),t+=e.GenerateCheckBox(14,"Hide Blank Anchors",!0),t+=e.GenerateCheckBox(15,"Hide Blank Links",!0),t+=e.GenerateCheckBox(11,"Hide Fragments",!0),t+=e.GenerateCheckBox(13,"Hide Mailto/Tel",!0),t+=e.GenerateCheckBox(16,"Hide Javascript",!0);let n="";n+=e.GenerateCheckBox(6,"Show Title",!0),n+=e.GenerateCheckBox(7,"Show Target",!1),n+=e.GenerateCheckBox(8,"Show Rel",!1),n+=e.GenerateCheckBox(9,"Show Type",!1),n+=e.GenerateCheckBox(10,"Show Count",!1);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel2,r)}get Button1(){return null==this.Container?null:this.Container.querySelectorAll("button")[0]}get Button2(){return null==this.Container?null:this.Container.querySelectorAll("button")[1]}get Container(){const e=this;return null==e.#e&&(e.#e=document.getElementById("nav-hyperlinks")),e.#e}get Label1(){return null==this.Container?null:this.Container.querySelectorAll("[role='label']")[0]}get MemoBox1(){return null==this.Container?null:this.Container.querySelectorAll("textarea")[0]}get Panel1(){return null==this.Container?null:this.Container.querySelectorAll("div[role='options']")[0]}get Panel2(){return null==this.Container?null:this.Container.querySelectorAll("div[role='filters']")[0]}get Table1(){return null==this.Container?null:this.Container.querySelectorAll("table")[0]}get TextBox1(){return null==this.Container?null:this.Container.querySelectorAll("input[role='textbox']")[0]}Clear(){const e=this;e.Table1.style.display="none",e.MemoBox1.style.display="none",e.SetHtml(e.Panel1,""),e.SetHtml(e.Panel2,"")}async Search(){const e=this;e.Label1.innerText="",e.Table1.style.display="none",e.MemoBox1.style.display="none";const t=await e.#t.GetHyperlinks(),n=t.length,r=await e.#o(t.copy());switch(r.length==n?e.Label1.innerText="Showing "+n+" result"+(1==n?"":"s"):e.Label1.innerText="Showing "+r.length+" of "+n+" result"+(1==n?"":"s"),e.#i(2)){case"table":e.#l(r);break;case"csv":e.#a(r);break;case"links":e.#s(r)}}async#o(e){const t=this,n=await t.#t.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t.#c(11)&&l.href.startsWith("#"))continue;if(t.#c(15)&&String.isNullOrWhitespace(l.href))continue;if(t.#c(13)&&(l.href.toLowerCase().startsWith("telno:")||l.href.toLowerCase().startsWith("mailto:")))continue;if(t.#c(16)&&l.href.toLowerCase().startsWith("javascript:"))continue;const a=new URL(l.href,n);if(t.#c(12)&&r!=a.hostname)continue;let s=t.#c(1)?l.innerHTML:l.innerText;if(t.#c(14)&&String.isNullOrWhitespace(s))continue;const c=t.#c(4)?a.href:l.href;if(t.#c(2)&&(s=s.trim()),!String.isNullOrWhitespace(t.TextBox1.value))if("anchor"==t.#i(1)){if(!s.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue}else if(!c.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue;o.push({text:s,href:c,title:t.#c(6)?l.title:"",target:t.#c(7)?l.target:"",rel:t.#c(8)?l.rel:"",type:t.#c(9)?l.type:"",occurrence:""})}if(t.#c(10)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t.#c(5)&&(o=o.distinct()),t.#c(3)&&(o=o.orderBy("text")),o}#u(){const e=this,t=[{id:6,name:"Title"},{id:7,name:"Target"},{id:8,name:"Rel"},{id:9,name:"Type"},{id:10,name:"Count"}];let n="";n+="<th>Anchor Text</th>",n+="<th>Address</th>";for(let r=0;r<t.length;r++)e.#c(t[r].id)&&(n+="<th>"+t[r].name+"</th>");return n}#c(e){if(null==this.Container)return!1;const t=this.Container.querySelectorAll("input[id='checkbox"+e+"']");return!(t.length<=0)&&t[0].checked}#i(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("select[name='comboBox"+e+"']");return t.length<=0?"":t[0].value}#h(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("input[name='radioGroup"+e+"']:checked");return t.length<=0?"":t[0].value}#l(e){const t=this,n=t.Table1.querySelectorAll("thead")[0],r=t.Table1.querySelectorAll("tbody")[0];n.innerHTML="",r.innerHTML="",t.Table1.style.display="table",n.innerHTML="<tr>"+t.#u()+"</tr>";for(let n=0;n<e.length;n++){const o=e[n];let i=[o.text,o.href];t.#c(6)&&i.push(o.title),t.#c(7)&&i.push(o.target),t.#c(8)&&i.push(o.rel),t.#c(9)&&i.push(o.type),t.#c(10)&&i.push(o.occurrence),r.innerHTML+=t.GenerateRow(i)}}#a(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];let o=[r.text,r.href];t.#c(6)&&o.push(r.title),t.#c(7)&&o.push(r.target),t.#c(8)&&o.push(r.rel),t.#c(9)&&o.push(r.type),t.#c(10)&&o.push(r.occurrence),t.MemoBox1.value+=t.GenerateCSVLine("\t",o),t.MemoBox1.value+="\n"}}#s(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];t.MemoBox1.value+=t.GenerateCSVLine("\t",[r.href]),t.MemoBox1.value+="\n"}}}(new class{async SendMessage(e,t){chrome.tabs.query({active:!0,currentWindow:!0},(function(n){chrome.tabs.sendMessage(n[0].id,{event:e},t)}))}async GetHyperlinks(){const e=this;return await e.GetLocation(),new Promise((function(t){e.SendMessage("GetNodes",(async function(e){t(e.copy())}))}))}async GetLocation(){const e=this;return new Promise((function(t){e.SendMessage("GetLocation",(function(e){t(e)}))}))}});document.addEventListener("DOMContentLoaded",(async function(e){t.InitialiseComponents()}))})(),{}})()));
\ No newline at end of file
diff --git a/popup.html b/popup.html
index cd60e99..b94ec92 100644
--- a/popup.html
+++ b/popup.html
@@ -31,63 +31,58 @@
             <div class="container-fluid">
                 <div class="pt-2 pb-2 mb-2 border-bottom">
                     <div class="row mb-2">
-                        <label for="textBox1" class="col-sm-3 col-form-label fw-bold">Search Term</label>
-                        <div class="col-sm-7">
+                        <label for="textBox1" class="col-sm-2 col-form-label fw-bold">Search</label>
+                        <div class="col-sm-10">
                             <div class="input-group input-group-sm">
-                                <input type="text" class="form-control" placeholder="Keyword" role="textbox" id="textBox1" />
+                                <input type="text" class="form-control" role="textbox" id="textBox1" />
+
+                                <select class="form-select pe-0 input-group-text" name="comboBox1">
+                                    <option value="anchor">Anchor</option>
+                                    <option value="link" selected>Link</option>
+                                </select>
+
                                 <button type="button" class="btn btn-secondary input-group-text">&#10005;</button>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-sm-3 cursor-default fw-bold">Search Field</div>
-                        <div class="col-sm-7">
-                            <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="radio" name="radioGroup1" id="radioBox1" value="anchor">
-                                <label class="form-check-label" for="radioBox1">Anchor Text</label>
-                            </div>
-                            <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="radio" name="radioGroup1" id="radioBox2" value="link" checked>
-                                <label class="form-check-label" for="radioBox2">Link Address</label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-3 cursor-default fw-bold">Display Type</div>
-                        <div class="col-sm-7">
-                            <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="radio" name="radioGroup2" id="radioBox3" value="table" checked>
-                                <label class="form-check-label" for="radioBox3">Table</label>
-                            </div>
-                            <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="radio" name="radioGroup2" id="radioBox4" value="csv">
-                                <label class="form-check-label" for="radioBox4">CSV</label>
-                            </div>
-                            <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="radio" name="radioGroup2" id="radioBox5" value="links">
-                                <label class="form-check-label" for="radioBox5">Links</label>
-                            </div>
-                        </div>
-                    </div>
                     <div class="row mt-2 mb-2">
-                        <div class="col-sm-3"></div>
-                        <div class="col-sm-7">
-                            <button type="button" class="btn btn-primary btn-sm">Load Results</button>
-                            <span class="ps-1" role="label"></span>
+                        <div class="col-2"></div>
+                        <div class="col-5">
+                            <div class="input-group input-group-sm">
+                                <button class="btn btn-primary" type="button">Load Results</button>
+                                <select class="form-select" name="comboBox2">
+                                  <option value="table" selected>Table</option>
+                                  <option value="csv">CSV</option>
+                                  <option value="links">Links</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-5 px-0">
+                            <div class="pt-2" role="label"></div>
                         </div>
                     </div>
                 </div>
 
                 <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel1" aria-expanded="false" aria-controls="collapsPanel1">&#11208;&nbsp;Options</div>
-                <div class="row pt-2 pb-2 mb-2 border-bottom collapse" role="options" id="collapsPanel1"></div>
+                <div class="row pb-2 mb-2 border-bottom collapse" id="collapsPanel1">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="options"></div>
+                    </div>
+                </div>
 
                 <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel2" aria-expanded="false" aria-controls="collapsPanel2">&#11208;&nbsp;Filters</div>
-                <div class="row pt-2 collapse" role="filters" id="collapsPanel2"></div>
+                <div class="row collapse" id="collapsPanel2">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="filters"></div>
+                    </div>
+                </div>
 
                 <div class="row pb-2 mb-2 border-bottom"></div>
 
                 <div class="row pt-2 mb-2">
-                    <div class="col">
+                    <div class="col px-0">
 
                         <table class="table table-bordered table-hover table-sm table-striped">
                             <thead></thead>
diff --git a/src/src/popup/acontent-service.js b/src/src/popup/acontent-service.js
index be7e4aa..a2d6378 100644
--- a/src/src/popup/acontent-service.js
+++ b/src/src/popup/acontent-service.js
@@ -52,9 +52,7 @@ class AContentService extends ContentService {
         col2 += a.GenerateCheckBox(3, "Sort By Anchor Text", true);
         col2 += a.GenerateCheckBox(2, "Trim Anchor Text", true);
 
-        let col3 = "";
-
-        let html = a.GenerateCols(col1, col2, col3);
+        let html = a.GenerateCols(col1, col2);
 
         a.SetHtml(a.Panel1, html);
     }
@@ -67,20 +65,18 @@ class AContentService extends ContentService {
         col1 += a.GenerateCheckBox(5, "Hide Duplicates", true);
         col1 += a.GenerateCheckBox(14, "Hide Blank Anchors", true);
         col1 += a.GenerateCheckBox(15, "Hide Blank Links", true);
+        col1 += a.GenerateCheckBox(11, "Hide Fragments", true);
+        col1 += a.GenerateCheckBox(13, "Hide Mailto/Tel", true);
+        col1 += a.GenerateCheckBox(16, "Hide Javascript", true);
 
         let col2 = "";
-        col2 += a.GenerateCheckBox(11, "Hide Fragments", true);
-        col2 += a.GenerateCheckBox(13, "Hide Mailto/Tel", true);
-        col2 += a.GenerateCheckBox(16, "Hide Javascript", true);
+        col2 += a.GenerateCheckBox(6, "Show Title", true);
+        col2 += a.GenerateCheckBox(7, "Show Target", false);
+        col2 += a.GenerateCheckBox(8, "Show Rel", false);
+        col2 += a.GenerateCheckBox(9, "Show Type", false);
+        col2 += a.GenerateCheckBox(10, "Show Count", false);
 
-        let col3 = "";
-        col3 += a.GenerateCheckBox(6, "Show Title", true);
-        col3 += a.GenerateCheckBox(7, "Show Target", false);
-        col3 += a.GenerateCheckBox(8, "Show Rel", false);
-        col3 += a.GenerateCheckBox(9, "Show Type", false);
-        col3 += a.GenerateCheckBox(10, "Show Count", false);
-
-        let html = a.GenerateCols(col1, col2, col3);
+        let html = a.GenerateCols(col1, col2);
 
         a.SetHtml(a.Panel2, html);
     }
@@ -123,7 +119,7 @@ class AContentService extends ContentService {
             return null;
         }
 
-        return a.Container.querySelectorAll("span[role='label']")[0];
+        return a.Container.querySelectorAll("[role='label']")[0];
     }
 
     get MemoBox1() {
@@ -206,7 +202,7 @@ class AContentService extends ContentService {
             a.Label1.innerText = "Showing " + newResults.length + " of " + totalCount + " result" + (totalCount == 1 ? "" : "s");
         }
 
-        switch (a.#getRadioGroup(2)) {
+        switch (a.#getComboBox(2)) {
             case "table":
                 a.#renderTable(newResults);
                 break;
@@ -226,8 +222,6 @@ class AContentService extends ContentService {
         const currentUrl = await a.#popupService.GetLocation();
         const currentHostname = (new URL(currentUrl)).hostname;
 
-        const radioGroup1 = a.#getRadioGroup(1);
-
         let result = [];
 
         for (let i=0; i<items.length; i++) {
@@ -290,7 +284,7 @@ class AContentService extends ContentService {
 
             // Search term
             if (!String.isNullOrWhitespace(a.TextBox1.value)) {
-                if (radioGroup1.value == "anchor") {
+                if (a.#getComboBox(1) == "anchor") {
                     if (!text.toLowerCase().includes(a.TextBox1.value.toLowerCase())) {
                         continue;
                     }
@@ -379,6 +373,21 @@ class AContentService extends ContentService {
         return result[0].checked;
     }
 
+    #getComboBox(num) {
+        const a = this;
+
+        if (a.Container == null) {
+            return "";
+        }
+
+        const result = a.Container.querySelectorAll("select[name='comboBox" + num + "']");
+        if (result.length <= 0) {
+            return "";
+        }
+
+        return result[0].value;
+    }
+
     #getRadioGroup(num) {
         const a = this;