diff --git a/index.html b/index.html
index 350cfac..c2f0294 100644
--- a/index.html
+++ b/index.html
@@ -51,7 +51,7 @@
         </header>
         <section id="verification_section" class="grid gap-1-5">
             <div class="grid gap-0-5">
-                <h1>KYC verification</h1>
+                <h2>KYC verification</h2>
                 <P>
                     Enter the address you want to verify
                 </P>
diff --git a/scripts/chainkyc.js b/scripts/chainkyc.js
index 53e8e31..7a61d91 100644
--- a/scripts/chainkyc.js
+++ b/scripts/chainkyc.js
@@ -87,7 +87,7 @@ floGlobals.approvedKycAggregators = {};
 function getApprovedAggregators() {
     return new Promise((resolve, reject) => {
         floBlockchainAPI.readAllTxs(floGlobals.masterAddress).then(txs => {
-            txs.filter(tx => tx.vin[0].addr === floGlobals.masterAddress && tx.floData.startsWith('KYC'))
+            txs.filter(tx => floCrypto.isSameAddr(tx.vin[0].addr, floGlobals.masterAddress) && tx.floData.startsWith('KYC'))
                 .reverse()
                 .forEach(tx => {
                     const { floData, time } = tx;
@@ -95,7 +95,7 @@ function getApprovedAggregators() {
                     switch (operationType) {
                         case 'APPROVE_AGGREGATOR':
                             operationData.split(',').forEach(aggregator => {
-                                floGlobals.approvedKycAggregators[aggregator] = {
+                                floGlobals.approvedKycAggregators[floCrypto.toFloID(aggregator)] = {
                                     validFrom: time * 1000,
                                     validTo: validity || Date.now() + 10000000
                                 };
@@ -103,7 +103,7 @@ function getApprovedAggregators() {
                             break;
                         case 'REVOKE_AGGREGATOR':
                             operationData.split(',').forEach(aggregator => {
-                                floGlobals.approvedKycAggregators[aggregator].validTo = time * 1000;
+                                floGlobals.approvedKycAggregators[floCrypto.toFloID(aggregator)].validTo = time * 1000;
                             });
                             break;
                         default: