diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 7b9ddb4..c4286bc 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -581,27 +581,36 @@ String WiFiManager::getScanItemOut(){
         }
       }
 
+      // token precheck, to speed up replacements on large ap lists
+      String HTTP_ITEM_STR = FPSTR(HTTP_ITEM);
+      bool tok_r = HTTP_ITEM_STR.indexOf("{r}") > 0;
+      bool tok_R = HTTP_ITEM_STR.indexOf("{R}") > 0;
+      bool tok_e = HTTP_ITEM_STR.indexOf("{e}") > 0;
+      bool tok_q = HTTP_ITEM_STR.indexOf("{q}") > 0;
+      bool tok_i = HTTP_ITEM_STR.indexOf("{i}") > 0;
+ 
       //display networks in page
       for (int i = 0; i < n; i++) {
         if (indices[i] == -1) continue; // skip dups
-        DEBUG_WM(WiFi.SSID(indices[i]));
-        DEBUG_WM(WiFi.RSSI(indices[i]));
-        int quality = getRSSIasQuality(WiFi.RSSI(indices[i]));
+
+        DEBUG_WM("AP: " + (String)WiFi.RSSI(indices[i]) + " " + (String)WiFi.SSID(indices[i]));
+
+        int rssiperc = getRSSIasQuality(WiFi.RSSI(indices[i]));
         uint8_t enc_type = WiFi.encryptionType(indices[i]);
 
-        if (_minimumQuality == -1 || _minimumQuality < quality) {
+        if (_minimumQuality == -1 || _minimumQuality < rssiperc) {
           String item = FPSTR(HTTP_ITEM);
-          String rssiQ;
-          rssiQ += quality;
           item.replace("{v}", WiFi.SSID(indices[i])); // ssid no encoding
-          item.replace("{R}", (String)WiFi.RSSI(indices[i])); // rssi
-          item.replace("{e}", encryptionTypeStr(enc_type));
-          item.replace("{r}", rssiQ); // qualitypercent
-          item.replace("{q}", (String)round(map(quality,0,100,1,4))); //quality icon 1-4
-          if (enc_type != ENC_TYPE_NONE) {
-            item.replace("{i}", "l");
-          } else {
-            item.replace("{i}", "");
+          if(tok_e) item.replace("{e}", encryptionTypeStr(enc_type));
+          if(tok_r) item.replace("{r}", (String)rssiperc); // rssi percentage 0-100
+          if(tok_R) item.replace("{R}", (String)WiFi.RSSI(indices[i])); // rssi db
+          if(tok_q) item.replace("{q}", (String)round(map(rssiperc,0,100,1,4))); //quality icon 1-4
+          if(tok_i){
+            if (enc_type != ENC_TYPE_NONE) {
+              item.replace("{i}", "l");
+            } else {
+              item.replace("{i}", "");
+            }
           }
           //DEBUG_WM(item);
           page += item;
@@ -613,6 +622,7 @@ String WiFiManager::getScanItemOut(){
       }
       page += "<br/>";
     }
+
     return page;
 }
 
@@ -673,6 +683,16 @@ String WiFiManager::getParamOut(){
 
   if(_paramsCount > 0){
 
+    String HTTP_PARAM_temp = FPSTR(HTTP_FORM_LABEL);
+    HTTP_PARAM_temp += FPSTR(HTTP_FORM_PARAM);
+    bool tok_i = HTTP_PARAM_temp.indexOf("{i}") > 0;
+    bool tok_n = HTTP_PARAM_temp.indexOf("{n}") > 0;
+    bool tok_p = HTTP_PARAM_temp.indexOf("{p}") > 0;
+    bool tok_t = HTTP_PARAM_temp.indexOf("{t}") > 0;
+    bool tok_l = HTTP_PARAM_temp.indexOf("{l}") > 0;
+    bool tok_v = HTTP_PARAM_temp.indexOf("{v}") > 0;
+    bool tok_c = HTTP_PARAM_temp.indexOf("{c}") > 0;
+
     page += FPSTR(HTTP_FORM_PARAM_START);
 
     char parLength[5];
@@ -698,14 +718,14 @@ String WiFiManager::getParamOut(){
           break;
       }
       if (_params[i]->getID() != NULL) {
-        pitem.replace("{i}", _params[i]->getID());
-        pitem.replace("{n}", _params[i]->getID());
-        pitem.replace("{p}", "{t}");
-        pitem.replace("{t}", _params[i]->getPlaceholder());
+        if(tok_i)pitem.replace("{i}", _params[i]->getID());
+        if(tok_n)pitem.replace("{n}", _params[i]->getID());
+        if(tok_p)pitem.replace("{p}", "{t}");
+        if(tok_t)pitem.replace("{t}", _params[i]->getPlaceholder());
         snprintf(parLength, 5, "%d", _params[i]->getValueLength());
-        pitem.replace("{l}", parLength);
-        pitem.replace("{v}", _params[i]->getValue());
-        pitem.replace("{c}", _params[i]->getCustomHTML()); // additional attributes not html
+        if(tok_l)pitem.replace("{l}", parLength);
+        if(tok_v)pitem.replace("{v}", _params[i]->getValue());
+        if(tok_c)pitem.replace("{c}", _params[i]->getCustomHTML()); // meant for additional attributes, not html
       } else {
         pitem = _params[i]->getCustomHTML();
       }
@@ -716,6 +736,7 @@ String WiFiManager::getParamOut(){
       page += FPSTR(HTTP_FORM_PARAM_END);
     }
   }
+
   return page;
 }
 
diff --git a/WiFiManager.h b/WiFiManager.h
index 0be462f..95ce014 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -45,11 +45,12 @@ const char HTTP_STYLE[] PROGMEM           = "<style>"
 const char HTTP_SCRIPT[] PROGMEM          = "<script>function c(l){document.getElementById('s').value=l.innerText||l.textContent;document.getElementById('p').focus();}</script>";
 const char HTTP_HEAD_END[] PROGMEM        = "</head><body><div class='wrap'>";
 const char HTTP_PORTAL_OPTIONS[] PROGMEM  = "<form action='/wifi' method='GET'><button>Configure WiFi</button></form><br/><form action='/0wifi' method='GET'><button>Configure WiFi (No Scan)</button></form><br/><form action='/i' method='GET'><button>Info</button></form><br/><form action='/r' method='GET'><button>Restart</button></form>";
-const char HTTP_ITEM[] PROGMEM            = "<div><a href='#p' onclick='c(this)'>{v}</a><div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i}'></div></div>";
+const char HTTP_ITEM[] PROGMEM            = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {e} {r}<div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i}'></div></div>";
+// const char HTTP_ITEM[] PROGMEM         = "<div><a href='#p' onclick='c(this)'>{v}</a> {R} {r}% {q} {e}</div>"; // test all tokens
 //const char HTTP_ITEM_PADLOCK[] PROGMEM = "<img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAALVBMVEX///8EBwfBwsLw8PAzNjaCg4NTVVUjJiZDRUUUFxdiZGSho6OSk5Pg4eFydHTCjaf3AAAAZElEQVQ4je2NSw7AIAhEBamKn97/uMXEGBvozkWb9C2Zx4xzWykBhFAeYp9gkLyZE0zIMno9n4g19hmdY39scwqVkOXaxph0ZCXQcqxSpgQpONa59wkRDOL93eAXvimwlbPbwwVAegLS1HGfZAAAAABJRU5ErkJggg==' width='13px'/>";
 const char HTTP_FORM_START[] PROGMEM      = "<form method='POST' action='wifisave'><label for='s'>SSID</label><input id='s' name='s' maxlength=32 placeholder='{v}'><br/><label for='p'>Password</label><input id='p' name='p' length=64 type='password' placeholder=''><br/>";
 const char HTTP_FORM_END[] PROGMEM        = "<br/><button type='submit'>Save</button></form>";
-const char HTTP_FORM_LABEL[] PROGMEM      = "<label for='{i}'>{p}</label>";
+const char HTTP_FORM_LABEL[] PROGMEM      = "<label for='{i}'>{t}</label>";
 const char HTTP_FORM_PARAM_START[] PROGMEM = "<hr>";
 const char HTTP_FORM_PARAM[] PROGMEM      = "<br/><input id='{i}' name='{n}' maxlength={l} placeholder='' value='{v}' {c}>";
 const char HTTP_FORM_PARAM_END[] PROGMEM  = "<br/>";