diff --git a/dns/dyndns/Makefile b/dns/dyndns/Makefile
index 8ee710b89..57c8a461f 100644
--- a/dns/dyndns/Makefile
+++ b/dns/dyndns/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		dyndns
 PLUGIN_VERSION=		1.6
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Dynamic DNS Support
 PLUGIN_MAINTAINER=	franco@opnsense.org
 
diff --git a/dns/dyndns/src/www/services_dyndns_edit.php b/dns/dyndns/src/www/services_dyndns_edit.php
index fc316978f..5baf4c6fc 100644
--- a/dns/dyndns/src/www/services_dyndns_edit.php
+++ b/dns/dyndns/src/www/services_dyndns_edit.php
@@ -269,30 +269,30 @@ include("head.inc");
 <?php
                        endforeach;?>
                        </select>
-                       <output class="hidden" for="help_for_requestif">
+                       <div class="hidden" data-for="help_for_requestif">
                          <?= gettext("Note: This is almost always the same as the Interface to Monitor.");?>
-                       </output>
+                       </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_host" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Hostname") ?></td>
                     <td>
                       <input name="host" type="text" id="host" value="<?= $pconfig['host'] ?>" />
-                      <output class="hidden" for="help_for_host">
+                      <div class="hidden" data-for="help_for_host">
                         <?= gettext("Enter the complete host/domain name. example: myhost.dyndns.org") ?><br />
                         <?= gettext("For he.net tunnelbroker, enter your tunnel ID") ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_default type_route53">
                     <td><a id="help_for_mx" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("MX") ?></td>
                     <td>
                       <input name="mx" type="text" id="mx" value="<?= $pconfig['mx'] ?>" />
-                      <output class="hidden" for="help_for_mx">
+                      <div class="hidden" data-for="help_for_mx">
                         <?= gettext("Note: With a dynamic DNS service you can only use a hostname, not an IP address.") ?>
                         <br />
                         <?= gettext("Set this option only if you need a special MX record. Not all services support this.") ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_default type_route53">
@@ -322,50 +322,50 @@ include("head.inc");
                     <td><a id="help_for_username" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Username") ?></td>
                     <td>
                       <input name="username" type="text" id="username" value="<?= $pconfig['username'] ?>" />
-                      <output class="hidden" for="help_for_username">
+                      <div class="hidden" data-for="help_for_username">
                         <?= gettext("Username is required for all types except Namecheap, FreeDNS and Custom Entries.");?>
                         <br /><?= gettext('Route 53: Enter your Access Key ID.') ?>
                         <br /><?= gettext('Duck DNS: Enter your Token.') ?>
                         <br /><?= gettext('For Custom Entries, Username and Password represent HTTP Authentication username and passwords.') ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_password" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Password") ?></td>
                     <td>
                       <input name="password" type="password" id="password" value="<?= $pconfig['password'] ?>" />
-                      <output class="hidden" for="help_for_password">
+                      <div class="hidden" data-for="help_for_password">
                         <?=gettext('FreeDNS (freedns.afraid.org): Enter your "Authentication Token" provided by FreeDNS.') ?>
                         <br /><?= gettext('Route 53: Enter your Secret Access Key.') ?>
                         <br /><?= gettext('Duck DNS: Leave blank.') ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_route53">
                     <td><a id="help_for_zoneid" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Zone ID") ?></td>
                     <td>
                       <input name="zoneid" type="text" id="zoneid" value="<?= $pconfig['zoneid'] ?>" />
-                      <output class="hidden" for="help_for_zoneid">
+                      <div class="hidden" data-for="help_for_zoneid">
                         <?= gettext("Enter Zone ID that you received when you created your domain in Route 53.") ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_custom">
                     <td><a id="help_for_updateurl" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Update URL") ?></td>
                     <td>
                       <input name="updateurl" type="text" id="updateurl" value="<?= $pconfig['updateurl'] ?>" />
-                      <output class="hidden" for="help_for_updateurl">
+                      <div class="hidden" data-for="help_for_updateurl">
                         <?= gettext("This is the only field required by for Custom Dynamic DNS, and is only used by Custom Entries.") ?>
                         <br />
                         <?= gettext("If you need the new IP to be included in the request, put %IP% in its place.") ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_custom">
                     <td><a id="help_for_resultmatch" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Result Match") ?></td>
                     <td>
                       <textarea name="resultmatch" class="formpre" id="resultmatch" cols="65" rows="7"><?= $pconfig['resultmatch'] ?></textarea>
-                      <output class="hidden" for="help_for_resultmatch">
+                      <div class="hidden" data-for="help_for_resultmatch">
                         <?= gettext("This field is only used by Custom Dynamic DNS Entries.") ?>
                         <br />
                         <?= gettext("This field should be identical to what your dynamic DNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.");?>
@@ -375,16 +375,16 @@ include("head.inc");
                         <?= gettext('If you need to include multiple possible values, separate them with a |. If your provider includes a |, escape it with \|') ?>
                         <br />
                         <?= gettext('Tabs (\t), newlines (\n) and carriage returns (\r) at the beginning or end of the returned results are removed before comparison.') ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr class="opt_field type_route53">
                     <td><a id="help_for_ttl" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("TTL");?></td>
                     <td>
                       <input name="ttl" type="text" id="ttl" value="<?= $pconfig['ttl'] ?>" />
-                      <output class="hidden" for="help_for_ttl">
+                      <div class="hidden" data-for="help_for_ttl">
                         <?= gettext("Choose TTL for your dns record.") ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/dns/rfc2136/Makefile b/dns/rfc2136/Makefile
index 302c3d5c6..709763c95 100644
--- a/dns/rfc2136/Makefile
+++ b/dns/rfc2136/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		rfc2136
 PLUGIN_VERSION=		1.2
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		RFC-2136 Support
 PLUGIN_MAINTAINER=	franco@opnsense.org
 PLUGIN_DEPENDS=		bind911
diff --git a/dns/rfc2136/src/www/services_rfc2136_edit.php b/dns/rfc2136/src/www/services_rfc2136_edit.php
index 29ec8dc39..3ade9d1bc 100644
--- a/dns/rfc2136/src/www/services_rfc2136_edit.php
+++ b/dns/rfc2136/src/www/services_rfc2136_edit.php
@@ -167,9 +167,9 @@ include("head.inc");
                     <td><a id="help_for_host" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Hostname");?></td>
                     <td>
                       <input name="host" type="text" id="host" value="<?=$pconfig['host'];?>" />
-                      <output class="hidden" for="help_for_host">
+                      <div class="hidden" data-for="help_for_host">
                         <?= gettext('Fully qualified hostname of the host to be updated.') ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -178,9 +178,9 @@ include("head.inc");
                       <input name="recordtype" type="radio" value="" <?= empty($pconfig['recordtype']) ? 'checked="checked"' : '' ?> /> <?=gettext('All');?> &nbsp;
                       <input name="recordtype" type="radio" value="A" <?= $pconfig['recordtype'] == 'A' ? 'checked="checked"' : '' ?> /> <?=gettext('A (IPv4)');?> &nbsp;
                       <input name="recordtype" type="radio" value="AAAA" <?= $pconfig['recordtype'] == 'AAAA' ? 'checked="checked"' : '' ?> /> <?=gettext('AAAA (IPv6)');?>
-                      <output class="hidden" for="help_for_recordtype">
+                      <div class="hidden" data-for="help_for_recordtype">
                         <?=gettext("'All' will update all available record types.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -193,9 +193,9 @@ include("head.inc");
                     <td><a id="help_for_keyname" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Key name");?></td>
                     <td>
                       <input name="keyname" type="text" id="keyname" value="<?=$pconfig['keyname'];?>" />
-                      <output class="hidden" for="help_for_keyname">
+                      <div class="hidden" data-for="help_for_keyname">
                         <?=gettext("This must match the setting on the DNS server.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -210,9 +210,9 @@ include("head.inc");
                     <td><a id="help_for_keydata" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Key");?></td>
                     <td>
                       <input name="keydata" type="text" id="keydata" size="70" value="<?=htmlspecialchars($pconfig['keydata']);?>" />
-                      <output class="hidden" for="help_for_keydata">
+                      <div class="hidden" data-for="help_for_keydata">
                         <?=gettext("Paste an HMAC-MD5 key here.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net-mgmt/snmp/Makefile b/net-mgmt/snmp/Makefile
index fa61ece65..0561c10a7 100644
--- a/net-mgmt/snmp/Makefile
+++ b/net-mgmt/snmp/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		snmp
 PLUGIN_VERSION=		1.1
+PLUGIN_REVISION=	1
 PLUGIN_DEPENDS=		bsnmp-regex bsnmp-ucd
 PLUGIN_COMMENT=		SNMP Server via bsnmpd
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net-mgmt/snmp/src/www/services_snmp.php b/net-mgmt/snmp/src/www/services_snmp.php
index b44be8ac1..415efcfaa 100644
--- a/net-mgmt/snmp/src/www/services_snmp.php
+++ b/net-mgmt/snmp/src/www/services_snmp.php
@@ -175,9 +175,9 @@ include("head.inc");
                       <td><a id="help_for_pollport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Polling Port") ?></td>
                       <td>
                         <input name="pollport" type="text" value="<?=$pconfig['pollport'];?>" />
-                        <output class="hidden" for="help_for_pollport">
+                        <div class="hidden" data-for="help_for_pollport">
                           <?=gettext("Enter the port to accept polling events on (default 161)");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -196,9 +196,9 @@ include("head.inc");
                       <td><a id="help_for_rocommunity" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Read Community String");?></td>
                       <td>
                         <input name="rocommunity" type="text" value="<?=$pconfig['rocommunity'];?>" />
-                        <output class="hidden" for="help_for_rocommunity">
+                        <div class="hidden" data-for="help_for_rocommunity">
                           <?=gettext("The community string is like a password, restricting access to querying SNMP to hosts knowing the community string. Use a strong value here to protect from unauthorized information disclosure.");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
@@ -226,27 +226,27 @@ include("head.inc");
                       <td><a id="help_for_trapserver" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Trap server");?></td>
                       <td>
                         <input name="trapserver" type="text" value="<?=$pconfig['trapserver'];?>" />
-                        <output class="hidden" for="help_for_trapserver">
+                        <div class="hidden" data-for="help_for_trapserver">
                           <?=gettext("Enter trap server name");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_trapserverport" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Trap server port") ?></td>
                       <td>
                         <input name="trapserverport" type="text" id="trapserverport" size="40" value="<?=htmlspecialchars($pconfig['trapserverport']) ? htmlspecialchars($pconfig['trapserverport']) : htmlspecialchars(162);?>" />
-                        <output class="hidden" for="help_for_trapserverport">
+                        <div class="hidden" data-for="help_for_trapserverport">
                           <?=gettext("Enter the port to send the traps to (default 162)");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_trapstring" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Enter the SNMP trap string");?></td>
                       <td>
                         <input name="trapstring" type="text" value="<?=$pconfig['trapstring'];?>" />
-                        <output class="hidden" for="help_for_trapstring">
+                        <div class="hidden" data-for="help_for_trapstring">
                           <?=gettext("Trap string");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/net/igmp-proxy/Makefile b/net/igmp-proxy/Makefile
index 074d305fa..9f3a0c754 100644
--- a/net/igmp-proxy/Makefile
+++ b/net/igmp-proxy/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		igmp-proxy
 PLUGIN_VERSION=		1.3
+PLUGIN_REVISION=	1
 PLUGIN_DEPENDS=		igmpproxy
 PLUGIN_COMMENT=		IGMP-Proxy Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/igmp-proxy/src/www/services_igmpproxy_edit.php b/net/igmp-proxy/src/www/services_igmpproxy_edit.php
index a0cba0dda..5cfeb8c93 100644
--- a/net/igmp-proxy/src/www/services_igmpproxy_edit.php
+++ b/net/igmp-proxy/src/www/services_igmpproxy_edit.php
@@ -173,9 +173,9 @@ include("head.inc");
                       <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
                       <td>
                         <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
-                        <output class="hidden" for="help_for_descr">
+                        <div class="hidden" data-for="help_for_descr">
                           <?=gettext("You may enter a description here for your reference (not parsed).");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -185,7 +185,7 @@ include("head.inc");
                           <option value="upstream" <?=$pconfig['type'] == "upstream" ?  "selected=\"selected\"" : ""; ?>><?=gettext("Upstream Interface");?></option>
                           <option value="downstream" <?= $pconfig['type'] == "downstream" ? "selected=\"selected\"" : ""; ?>><?=gettext("Downstream Interface");?></option>
                         </select>
-                        <output class="hidden" for="help_for_type">
+                        <div class="hidden" data-for="help_for_type">
                             <?=gettext("The upstream network interface is the outgoing interface which is".
                               " responsible for communicating to available multicast data sources.".
                               " There can only be one upstream interface.");?>
@@ -193,18 +193,18 @@ include("head.inc");
                           <?=gettext("Downstream network interfaces are the distribution interfaces to the".
                              " destination networks, where multicast clients can join groups and".
                              " receive multicast data. One or more downstream interfaces must be configured.");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_threshold" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Threshold");?></td>
                       <td>
                         <input name="threshold" type="text" class="formfld unknown" id="threshold" value="<?=$pconfig['threshold'];?>" />
-                        <output class="hidden" for="help_for_threshold">
+                        <div class="hidden" data-for="help_for_threshold">
                           <?=gettext("Defines the TTL threshold for the network interface. ".
                                "Packets with a lower TTL than the threshold value will be ignored. ".
                                "This setting is optional, and by default the threshold is 1.");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                   <tr>
diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
index 35659cc4f..0be8638bc 100644
--- a/net/l2tp/Makefile
+++ b/net/l2tp/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		l2tp
 PLUGIN_VERSION=		1.7
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		clog mpd5
 PLUGIN_COMMENT=		L2TP server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/l2tp/src/www/vpn_l2tp.php b/net/l2tp/src/www/vpn_l2tp.php
index afa26b45b..571cd0e03 100644
--- a/net/l2tp/src/www/vpn_l2tp.php
+++ b/net/l2tp/src/www/vpn_l2tp.php
@@ -210,18 +210,18 @@ include("head.inc");
                     <td><a id="help_for_localip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Server Address");?></td>
                     <td>
                       <input name="localip" type="text" id="localip" value="<?=$pconfig['localip'];?>" />
-                      <output class="hidden" for="help_for_localip">
+                      <div class="hidden" data-for="help_for_localip">
                         <?=gettext("Enter the IP address the L2TP server should give to clients for use as their \"gateway\"."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_remoteip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Remote Address Range");?></td>
                     <td>
                       <input name="remoteip" type="text" id="remoteip" value="<?=$pconfig['remoteip'];?>" />
-                      <output class="hidden" for="help_for_remoteip">
+                      <div class="hidden" data-for="help_for_remoteip">
                         <?=gettext("Specify the starting address for the client IP address subnet.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -240,18 +240,18 @@ include("head.inc");
                                 }
                                 ?>
                       </select>
-                      <output class="hidden" for="help_for_n_l2tp_units">
+                      <div class="hidden" data-for="help_for_n_l2tp_units">
                         <?=gettext("Hint: 10 is ten L2TP clients"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_secret" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Secret");?></td>
                     <td>
                       <input type="password" name="secret" id="secret" value="<?=$pconfig['secret']; ?>" />
-                      <output class="hidden" for="help_for_secret">
+                      <div class="hidden" data-for="help_for_secret">
                         <?=gettext("Specify optional secret shared between peers. Required on some devices/setups.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -265,9 +265,9 @@ include("head.inc");
                           <?=gettext("PAP"); ?>
                         </option>
                       </select>
-                      <output class="hidden" for="help_for_paporchap">
+                      <div class="hidden" data-for="help_for_paporchap">
                         <?=gettext("Specifies which protocol to use for authentication.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -275,9 +275,9 @@ include("head.inc");
                     <td>
                       <input name="l2tp_dns1" type="text" id="l2tp_dns1" value="<?=$pconfig['l2tp_dns1'];?>" /><br/>
                       <input name="l2tp_dns2" type="text" id="l2tp_dns2" value="<?=$pconfig['l2tp_dns2'];?>" />
-                      <output class="hidden" for="help_for_l2tp_dns">
+                      <div class="hidden" data-for="help_for_l2tp_dns">
                         <?=gettext("primary and secondary DNS servers assigned to L2TP clients"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -291,41 +291,41 @@ include("head.inc");
                     <td>
                       <input name="radiusenable" type="checkbox" id="radiusenable" value="yes" <?=($pconfig['radiusenable']) ? "checked=\"checked\"" : "";?>/>
                       <strong> <?=gettext("Use a RADIUS server for authentication");?><br /></strong>
-                      <output class="hidden" for="help_for_radius">
+                      <div class="hidden" data-for="help_for_radius">
                         <?=gettext("When set, all users will be authenticated using the RADIUS server specified below. The local user database will not be used.");?>
-                      </output>
+                      </div>
                       <input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" <?=($pconfig['radacct_enable']) ? "checked=\"checked\"" : "";?>/>
                       <strong><?=gettext("Enable RADIUS accounting");?></strong><br />
-                      <output class="hidden" for="help_for_radius">
+                      <div class="hidden" data-for="help_for_radius">
                         <?=gettext("Sends accounting packets to the RADIUS server.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiusserver" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS Server");?></td>
                     <td>
                       <input name="radiusserver" type="text" id="radiusserver" value="<?=$pconfig['radiusserver'];?>" />
-                      <output class="hidden" for="help_for_radiusserver">
+                      <div class="hidden" data-for="help_for_radiusserver">
                         <?=gettext("Enter the IP address of the RADIUS server.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiussecret" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS Shared Secret");?></td>
                     <td>
                       <input name="radiussecret" type="password" class="form-control pwd" id="radiussecret" value="<?=$pconfig['radiussecret'];?>" />
-                      <output class="hidden" for="help_for_radiussecret">
+                      <div class="hidden" data-for="help_for_radiussecret">
                         <?=gettext("Enter the shared secret that will be used to authenticate to the RADIUS server.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiusissueips" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS Issued IP's");?></td>
                     <td>
                       <input name="radiusissueips" value="yes" type="checkbox" class="form-control" id="radiusissueips"<?=$pconfig['radiusissueips'] ? " checked=\"checked\"" : "";?>>
-                      <output class="hidden" for="help_for_radiusissueips">
+                      <div class="hidden" data-for="help_for_radiusissueips">
                         <?=gettext("Issue IP Addresses via RADIUS server.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net/l2tp/src/www/vpn_l2tp_users_edit.php b/net/l2tp/src/www/vpn_l2tp_users_edit.php
index 873b2d520..83901d0c0 100644
--- a/net/l2tp/src/www/vpn_l2tp_users_edit.php
+++ b/net/l2tp/src/www/vpn_l2tp_users_edit.php
@@ -181,9 +181,9 @@ include("head.inc");
                     <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
                     <td>
                       <input name="ip" type="text" value="<?=$pconfig['ip'];?>" />
-                      <output class="hidden" for="help_for_ip">
+                      <div class="hidden" data-for="help_for_ip">
                         <?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net/pppoe/Makefile b/net/pppoe/Makefile
index b90bb7ed9..cf59913b5 100644
--- a/net/pppoe/Makefile
+++ b/net/pppoe/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		pppoe
 PLUGIN_VERSION=		1.7
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		clog mpd5
 PLUGIN_COMMENT=		PPPoE server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/pppoe/src/www/vpn_pppoe_edit.php b/net/pppoe/src/www/vpn_pppoe_edit.php
index ae588af00..32bf57f87 100644
--- a/net/pppoe/src/www/vpn_pppoe_edit.php
+++ b/net/pppoe/src/www/vpn_pppoe_edit.php
@@ -300,9 +300,9 @@ legacy_html_escape_form_data($pconfig);
                     <td><a id="help_for_localip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Server address"); ?></td>
                     <td>
                       <input name="localip" type="text" value="<?=$pconfig['localip'];?>" />
-                      <output class="hidden" for="help_for_localip">
+                      <div class="hidden" data-for="help_for_localip">
                         <?=gettext("Enter the IP address the PPPoE server should give to clients for use as their \"gateway\"."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -317,18 +317,18 @@ legacy_html_escape_form_data($pconfig);
 <?php
                       endfor;?>
                       </select>
-                      <output class="hidden" for="help_for_n_pppoe_units">
+                      <div class="hidden" data-for="help_for_n_pppoe_units">
                         <?=gettext("Hint: 10 is ten PPPoE clients"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_remoteip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Remote address range"); ?></td>
                     <td>
                       <input name="remoteip" type="text" value="<?=$pconfig['remoteip'];?>" />
-                      <output class="hidden" for="help_for_remoteip">
+                      <div class="hidden" data-for="help_for_remoteip">
                         <?=gettext("Specify the starting address for the client IP address subnet."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -342,9 +342,9 @@ legacy_html_escape_form_data($pconfig);
 <?php
                       endfor;?>
                       </select>
-                      <output class="hidden" for="help_for_pppoe_subnet">
+                      <div class="hidden" data-for="help_for_pppoe_subnet">
                         <?=gettext("Hint: 24 is 255.255.255.0"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -359,9 +359,9 @@ legacy_html_escape_form_data($pconfig);
                       <input name="dns1" type="text" value="<?=$pconfig['dns1'];?>" />
                       <br />
                       <input name="dns2" type="text" value="<?=$pconfig['dns2'];?>" />
-                      <output class="hidden" for="help_for_dns">
+                      <div class="hidden" data-for="help_for_dns">
                         <?=gettext("If entered they will be given to all PPPoE clients, else LAN DNS and one WAN DNS will go to all clients"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -369,48 +369,48 @@ legacy_html_escape_form_data($pconfig);
                     <td>
                       <input name="radiusenable" type="checkbox" value="yes" <?=!empty($pconfig['radiusenable']) ? "checked=\"checked\"" : ""; ?>/>
                       <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br/>
-                      <output class="hidden" for="help_for_radiusenable">
+                      <div class="hidden" data-for="help_for_radiusenable">
                         <?=gettext("When set, all users will be authenticated using " .
                                     "the RADIUS server specified below. The local user database " .
                                     "will not be used."); ?>
-                      </output>
+                      </div>
                       <input name="radacct_enable" type="checkbox" value="yes" <?=!empty($pconfig['radacct_enable']) ? "checked=\"checked\"" : "";?> />
                       <strong><?=gettext("Enable RADIUS accounting"); ?> <br /></strong>
-                      <output class="hidden" for="help_for_radiusenable">
+                      <div class="hidden" data-for="help_for_radiusenable">
                         <?=gettext("Sends accounting packets to the RADIUS server"); ?>.
-                      </output>
+                      </div>
                       <input name="radiussecenable" type="checkbox" value="yes" <?=!empty($pconfig['radiussecenable']) ? "checked=\"checked\"" : "";?> />
                       <strong><?=gettext("Use Backup RADIUS Server"); ?></strong><br />
-                      <output class="hidden" for="help_for_radiusenable">
+                      <div class="hidden" data-for="help_for_radiusenable">
                         <?=gettext("When set, if primary server fails all requests will be sent via backup server"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radius_nasip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("NAS IP Address"); ?></td>
                     <td>
                       <input name="radius_nasip" type="text" id="radius_nasip" value="<?=$pconfig['radius_nasip'];?>" />
-                      <output class="hidden" for="help_for_radius_nasip">
+                      <div class="hidden" data-for="help_for_radius_nasip">
                         <?=gettext("RADIUS server NAS IP Address"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radius_acct_update" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS Accounting Update"); ?></td>
                     <td>
                       <input name="radius_acct_update" type="text"  value="<?=$pconfig['radius_acct_update'];?>" />
-                      <output class="hidden" for="help_for_radius_acct_update">
+                      <div class="hidden" data-for="help_for_radius_acct_update">
                         <?=gettext("RADIUS accounting update period in seconds"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiusissueips" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS issued IPs"); ?></td>
                     <td>
                       <input name="radiusissueips" value="yes" type="checkbox" <?=!empty($pconfig['radiusissueips']) ? "checked=\"checked\"" : "";?> />
-                      <output class="hidden" for="help_for_radiusissueips">
+                      <div class="hidden" data-for="help_for_radiusissueips">
                         <?=gettext("Issue IP Addresses via RADIUS server."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -432,20 +432,20 @@ legacy_html_escape_form_data($pconfig);
                           </tr>
                         </tbody>
                       </table>
-                      <output class="hidden" for="help_for_radiusserver">
+                      <div class="hidden" data-for="help_for_radiusserver">
                         <?=gettext("Enter the IP address, authentication port and accounting port (optional) of the RADIUS server."); ?><br />
                         <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiussecret" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS primary shared secret"); ?></td>
                     <td>
                       <input name="radiussecret" type="password"  value="<?=$pconfig['radiussecret'];?>" />
-                      <output class="hidden" for="help_for_radiussecret">
+                      <div class="hidden" data-for="help_for_radiussecret">
                         <?=gettext("Enter the shared secret that will be used to authenticate " .
                                                 "to the RADIUS server"); ?>.
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -467,19 +467,19 @@ legacy_html_escape_form_data($pconfig);
                           </tr>
                         </tbody>
                       </table>
-                      <output class="hidden" for="help_for_radiusserver2">
+                      <div class="hidden" data-for="help_for_radiusserver2">
                         <?=gettext("Enter the IP address, authentication port and accounting port (optional) of the backup RADIUS server."); ?><br />
                         <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_radiussecret2" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a><?=gettext("RADIUS secondary shared secret"); ?></td>
                     <td>
                       <input name="radiussecret2" type="password" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>" />
-                      <output class="hidden" for="help_for_radiussecret2">
+                      <div class="hidden" data-for="help_for_radiussecret2">
                         <?=gettext("Enter the shared secret that will be used to authenticate " ."to the RADIUS server"); ?>.
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net/pptp/Makefile b/net/pptp/Makefile
index 42ae7db74..cd1e45bbd 100644
--- a/net/pptp/Makefile
+++ b/net/pptp/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		pptp
 PLUGIN_VERSION=		1.7
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		clog mpd5
 PLUGIN_COMMENT=		PPTP server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/pptp/src/www/vpn_pptp.php b/net/pptp/src/www/vpn_pptp.php
index 5d93270a7..f991342b1 100644
--- a/net/pptp/src/www/vpn_pptp.php
+++ b/net/pptp/src/www/vpn_pptp.php
@@ -228,27 +228,27 @@ include("head.inc");
                           }
                           ?>
                         </select>
-                        <output class="hidden" for="help_for_n_pptp_units">
+                        <div class="hidden" data-for="help_for_n_pptp_units">
                           <?=gettext("Hint: 10 is ten PPTP clients"); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_localip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Server address"); ?></td>
                       <td>
                         <input name="localip" type="text" id="localip" value="<?=$pconfig['localip'];?>" />
-                        <output class="hidden" for="help_for_localip">
+                        <div class="hidden" data-for="help_for_localip">
                           <?=gettext("Enter the IP address the PPTP server should give to clients for use as their \"gateway\"."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_remoteip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Remote address range"); ?></td>
                       <td>
                         <input name="remoteip" type="text" id="remoteip" value="<?=htmlspecialchars($pconfig['remoteip']);?>" />
-                        <output class="hidden" for="help_for_remoteip">
+                        <div class="hidden" data-for="help_for_remoteip">
                           <?=gettext("Specify the starting address for the client IP address subnet."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -256,9 +256,9 @@ include("head.inc");
                       <td>
                         <input name="pptp_dns1" type="text" id="pptp_dns1" value="<?=$pconfig['pptp_dns1'];?>" /><br />
                         <input name="pptp_dns2" type="text" id="pptp_dns2" value="<?=$pconfig['pptp_dns2'];?>" />
-                        <output class="hidden" for="help_for_pptp_dns">
+                        <div class="hidden" data-for="help_for_pptp_dns">
                           <?=gettext("primary and secondary DNS servers assigned to PPTP clients"); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -272,26 +272,26 @@ include("head.inc");
                       <td>
                         <input name="radiusenable" type="checkbox" id="radiusenable" value="yes" <?=($pconfig['radiusenable']) ? "checked=\"checked\"" : "";?>/>
                         <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br/>
-                        <output class="hidden" for="help_for_radius">
+                        <div class="hidden" data-for="help_for_radius">
                           <?=gettext("When set, all users will be authenticated using " .
                           "the RADIUS server specified below. The local user database " .
                           "will not be used."); ?>
-                        </output>
+                        </div>
                         <input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" <?=($pconfig['radacct_enable']) ? "checked=\"checked\"" : "";?>/>
                         <strong><?=gettext("Enable RADIUS accounting"); ?></strong><br/>
-                        <output class="hidden" for="help_for_radius">
+                        <div class="hidden" data-for="help_for_radius">
                           <?=gettext("Sends accounting packets to the RADIUS server."); ?>
-                        </output>
+                        </div>
                         <input name="radiussecenable" type="checkbox" id="radiussecenable" value="yes" <?=($pconfig['radiussecenable']) ? "checked=\"checked\"" : "";?>/>
                         <strong><?=gettext("Secondary RADIUS server for failover authentication"); ?></strong><br />
-                        <output class="hidden" for="help_for_radius">
+                        <div class="hidden" data-for="help_for_radius">
                           <?=gettext("When set, all requests will go to the secondary server when primary fails"); ?>
-                        </output>
+                        </div>
                         <input name="radiusissueips" value="yes" type="checkbox" id="radiusissueips"<?=($pconfig['radiusissueips']) ? " checked=\"checked\"" : "";?>/>
                         <strong><?=gettext("RADIUS issued IPs"); ?></strong>
-                        <output class="hidden" for="help_for_radius">
+                        <div class="hidden" data-for="help_for_radius">
                           <?=gettext("Issue IP addresses via RADIUS server."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -304,9 +304,9 @@ include("head.inc");
                       <td><a id="help_for_radius_acct_update" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS Accounting Update"); ?></td>
                       <td>
                           <input name="radius_acct_update" type="text" id="radius_acct_update" value="<?=$pconfig['radius_acct_update'];?>" />
-                          <output class="hidden" for="help_for_radius_acct_update">
+                          <div class="hidden" data-for="help_for_radius_acct_update">
                             <?=gettext("RADIUS accounting update period in seconds"); ?>
-                          </output>
+                          </div>
                       </td>
                     </tr>
                     <tr>
@@ -328,20 +328,20 @@ include("head.inc");
                             </tr>
                           </tbody>
                         </table>
-                        <output class="hidden" for="help_for_radiusserver">
+                        <div class="hidden" data-for="help_for_radiusserver">
                           <?=gettext("Enter the IP address, authentication port and accounting port (optional) of the RADIUS server."); ?><br />
                           <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_radiussecret" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS primary shared secret"); ?></td>
                       <td>
                         <input name="radiussecret" type="password"  value="<?=$pconfig['radiussecret'];?>" />
-                        <output class="hidden" for="help_for_radiussecret">
+                        <div class="hidden" data-for="help_for_radiussecret">
                           <?=gettext("Enter the shared secret that will be used to authenticate " .
                                                   "to the RADIUS server"); ?>.
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -363,19 +363,19 @@ include("head.inc");
                             </tr>
                           </tbody>
                         </table>
-                        <output class="hidden" for="help_for_radiusserver2">
+                        <div class="hidden" data-for="help_for_radiusserver2">
                           <?=gettext("Enter the IP address, authentication port and accounting port (optional) of the backup RADIUS server."); ?><br />
                           <br /> <?=gettext("standard port 1812 and 1813 accounting"); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_radiussecret2" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("RADIUS secondary shared secret"); ?></td>
                       <td>
                         <input name="radiussecret2" type="password" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>" />
-                        <output class="hidden" for="help_for_radiussecret2">
+                        <div class="hidden" data-for="help_for_radiussecret2">
                           <?=gettext("Enter the shared secret that will be used to authenticate " ."to the RADIUS server"); ?>.
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -383,12 +383,12 @@ include("head.inc");
                       <td>
                         <input name="req128" type="checkbox" id="req128" value="yes" <?=($pconfig['req128']) ? "checked=\"checked\"" : "";?> />
                         <strong><?=gettext("Require 128-bit encryption"); ?></strong>
-                        <output class="hidden" for="help_for_req128">
+                        <div class="hidden" data-for="help_for_req128">
                           <?=gettext("When set, only 128-bit encryption will be accepted. Otherwise " .
                                     "40-bit and 56-bit encryption will be accepted as well. Note that " .
                                     "encryption will always be forced on PPTP connections (i.e. " .
                                     "unencrypted connections will not be accepted)."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
diff --git a/net/pptp/src/www/vpn_pptp_users_edit.php b/net/pptp/src/www/vpn_pptp_users_edit.php
index 177262f61..0d530e6fe 100644
--- a/net/pptp/src/www/vpn_pptp_users_edit.php
+++ b/net/pptp/src/www/vpn_pptp_users_edit.php
@@ -186,9 +186,9 @@ include("head.inc");
                     <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
                     <td>
                       <input name="ip" type="text" class="form-control unknown" id="ip" value="<?=htmlspecialchars($pconfig['ip']);?>" />
-                      <output class="hidden" for="help_for_ip">
+                      <div class="hidden" data-for="help_for_ip">
                         <?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 04833cc72..6804d0fdd 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		relayd
 PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1
 PLUGIN_DEPENDS=		relayd
 PLUGIN_COMMENT=		Relayd Load Balancer
 PLUGIN_MAINTAINER=	frank.brendel@eurolog.com
diff --git a/net/relayd/src/www/load_balancer_pool_edit.php b/net/relayd/src/www/load_balancer_pool_edit.php
index 49c2681d4..e5d8f58d7 100644
--- a/net/relayd/src/www/load_balancer_pool_edit.php
+++ b/net/relayd/src/www/load_balancer_pool_edit.php
@@ -267,19 +267,19 @@ include("head.inc");
                     <td><a id="help_for_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Port"); ?></td>
                     <td>
                       <input type="text" id="port"  name="port" value="<?=$pconfig['port'];?>"/>
-                      <output class="hidden" for="help_for_port">
+                      <div class="hidden" data-for="help_for_port">
                         <?=gettext("This is the port your servers are listening on."); ?><br />
                         <?=gettext("You may also specify a port alias listed in Firewall -&gt; Aliases here."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_retry" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Retry"); ?></td>
                     <td>
                       <input name="retry" type="text" value="<?=$pconfig['retry'];?>"/>
-                      <output for="help_for_retry" class="hidden">
+                      <div class="hidden" data-for="help_for_retry">
                         <?=gettext("Optionally specify how many times to retry checking a server before declaring it down."); ?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
diff --git a/net/relayd/src/www/load_balancer_setting.php b/net/relayd/src/www/load_balancer_setting.php
index 18790bba4..f654e6916 100644
--- a/net/relayd/src/www/load_balancer_setting.php
+++ b/net/relayd/src/www/load_balancer_setting.php
@@ -120,27 +120,27 @@ include("head.inc");
                        <td><a id="help_for_timeout" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Timeout") ; ?></td>
                        <td>
                          <input type="text" name="timeout" id="timeout" value="<?=$pconfig['timeout'];?>" />
-                         <output class="hidden" for="help_for_timeout">
+                         <div class="hidden" data-for="help_for_timeout">
                            <?=gettext("Set the global timeout in milliseconds for checks. Leave blank to use the default value of 1000 ms "); ?>
-                         </output>
+                         </div>
                        </td>
                     </tr>
                     <tr>
                        <td><a id="help_for_interval" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interval") ; ?></td>
                        <td>
                          <input type="text" name="interval" id="interval" value="<?=$pconfig['interval']; ?>"/>
-                         <output class="hidden" for="help_for_interval">
+                         <div class="hidden" data-for="help_for_interval">
                            <?=gettext("Set the interval in seconds at which the member of a pool will be checked. Leave blank to use the default interval of 10 seconds"); ?>
-                         </output>
+                         </div>
                       </td>
                    </tr>
                     <tr>
                        <td><a id="help_for_prefork" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Prefork") ; ?></td>
                        <td>
                          <input type="text" name="prefork" id="prefork" value="<?=$pconfig['prefork']; ?>"/>
-                         <output class="hidden" for="help_for_prefork">
+                         <div class="hidden" data-for="help_for_prefork">
                            <?=gettext("Number of processes used by relayd for dns protocol. Leave blank to use the default value of 5 processes"); ?>
-                         </output>
+                         </div>
                       </td>
                    </tr>
                    <tr>
@@ -148,7 +148,7 @@ include("head.inc");
                      <td>
                        <input name="lb_use_sticky" type="checkbox" id="lb_use_sticky" value="yes" <?= !empty($pconfig['lb_use_sticky']) ? 'checked="checked"' : '';?>/>
                        <strong><?=gettext("Use sticky connections"); ?></strong><br />
-                       <output class="hidden" for="help_for_lb_use_sticky">
+                       <div class="hidden" data-for="help_for_lb_use_sticky">
                          <?=gettext("Successive connections will be redirected to the servers " .
                                              "in a round-robin manner with connections from the same " .
                                              "source being sent to the same web server. This 'sticky " .
@@ -156,7 +156,7 @@ include("head.inc");
                                              "refer to this connection. Once the states expire, so will " .
                                              "the sticky connection. Further connections from that host " .
                                              "will be redirected to the next web server in the round-robin."); ?>
-                       </output>
+                       </div>
                      </td>
                    </tr>
                    <tr>
diff --git a/net/relayd/src/www/load_balancer_virtual_server_edit.php b/net/relayd/src/www/load_balancer_virtual_server_edit.php
index 049f33ff0..dd4f6d2ca 100644
--- a/net/relayd/src/www/load_balancer_virtual_server_edit.php
+++ b/net/relayd/src/www/load_balancer_virtual_server_edit.php
@@ -219,21 +219,21 @@ include("head.inc");
                       <td><a id="help_for_ipaddr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP Address"); ?></td>
                       <td>
                         <input type="text" id="ipadd" name="ipaddr" value="<?=$pconfig['ipaddr'];?>" />
-                        <output class="hidden" for="help_for_ipaddr">
+                        <div class="hidden" data-for="help_for_ipaddr">
                           <?=gettext("This is normally the WAN IP address that you would like the server to listen on. All connections to this IP and port will be forwarded to the pool cluster."); ?>
                           <br /><?=gettext("You may also specify a host alias listed in Firewall -&gt; Aliases here."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Port"); ?></td>
                       <td>
                         <input type="text" name="port" id="port" value="<?=$pconfig['port'];?>" />
-                        <output class="hidden" for="help_for_port">
+                        <div class="hidden" data-for="help_for_port">
                           <?=gettext("This is the port that the clients will connect to. All connections to this port will be forwarded to the pool cluster."); ?>
                           <br /><?=gettext("If left blank, listening ports from the pool will be used."); ?>
                           <br /><?=gettext("You may also specify a port alias listed in Firewall -&gt; Aliases here."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -280,10 +280,10 @@ include("head.inc");
                         </select>
 <?php
                         endif; ?>
-                        <output class="hidden" for="help_for_sitedown">
+                        <div class="hidden" data-for="help_for_sitedown">
                           <?=gettext("The server pool to which clients will be redirected if *ALL* servers in the Virtual Server Pool are offline."); ?>
                           <br /><?=gettext("This option is NOT compatible with the DNS relay protocol."); ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -297,12 +297,12 @@ include("head.inc");
                             <?=gettext("Relay");?>
                           </option>
                         </select>
-                        <output class="hidden" for="help_for_mode">
+                        <div class="hidden" data-for="help_for_mode">
                           <strong><?=gettext("Redirect");?></strong><br/>
                           <?=gettext("Redirections are translated to pf(4) rdr-to rules for stateful forwarding to a target host from a health-checked table on layer 3.");?>
                           <strong><?=gettext("Relay");?></strong><br/>
                           <?=gettext("Relays allow application layer load balancing, TLS acceleration, and general purpose TCP proxying on layer 7.");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr id="protocol">
@@ -323,9 +323,9 @@ include("head.inc");
                       <td><a id="help_for_sessiontimeout" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Session Timeout"); ?></td>
                       <td>
                         <input type="text" name="sessiontimeout" id="sessiontimeout" value="<?=$pconfig['sessiontimeout'];?>" />
-                        <output class="hidden" for="help_for_sessiontimeout">
+                        <div class="hidden" data-for="help_for_sessiontimeout">
                           <?= sprintf(gettext('This is the timeout in seconds for idle sessions. The default timeout is %s, the maximum is %s (%s years).'), 600, 2147483647, (int)(2147483647 / 60 / 60 / 24 / 365)) ?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                       <td>&nbsp;</td>
diff --git a/net/upnp/Makefile b/net/upnp/Makefile
index 33fc73f05..9bdb9e7d4 100644
--- a/net/upnp/Makefile
+++ b/net/upnp/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		upnp
 PLUGIN_VERSION=		1.2
+PLUGIN_REVISION=	1
 PLUGIN_DEPENDS=		miniupnpd
 PLUGIN_COMMENT=		Universal Plug and Play Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/upnp/src/www/services_upnp.php b/net/upnp/src/www/services_upnp.php
index acb4dc690..7d05533fe 100644
--- a/net/upnp/src/www/services_upnp.php
+++ b/net/upnp/src/www/services_upnp.php
@@ -196,18 +196,18 @@ include("head.inc");
                       <td><a id="help_for_enable_upnp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Allow UPnP Port Mapping");?></td>
                       <td>
                        <input name="enable_upnp" type="checkbox" value="yes" <?=!empty($pconfig['enable_upnp']) ? "checked=\"checked\"" : ""; ?> />
-                       <output class="hidden" for="help_for_enable_upnp">
+                       <div class="hidden" data-for="help_for_enable_upnp">
                          <?=gettext("This protocol is often used by Microsoft-compatible systems.");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_enable_natpmp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Allow NAT-PMP Port Mapping");?></td>
                       <td>
                        <input name="enable_natpmp" type="checkbox" value="yes" <?=!empty($pconfig['enable_natpmp']) ? "checked=\"checked\"" : ""; ?> />
-                       <output class="hidden" for="help_for_enable_natpmp">
+                       <div class="hidden" data-for="help_for_enable_natpmp">
                          <?=gettext("This protocol is often used by Apple-compatible systems.");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
@@ -222,9 +222,9 @@ include("head.inc");
 <?php
                         endforeach;?>
                        </select>
-                       <output class="hidden" for="help_for_ext_iface">
+                       <div class="hidden" data-for="help_for_ext_iface">
                          <?=gettext("Select only your primary WAN interface (interface with your default route). Only one interface is allowed here, not multiple.");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
@@ -242,27 +242,27 @@ include("head.inc");
 <?php
                         endforeach;?>
                        </select>
-                       <output class="hidden" for="help_for_ext_iface">
+                       <div class="hidden" data-for="help_for_ext_iface">
                          <?=gettext("You can select multiple interfaces here.");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_download" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Maximum Download Speed");?></td>
                       <td>
                         <input name="download" type="text" value="<?=$pconfig['download'];?>" />
-                        <output class="hidden" for="help_for_download">
+                        <div class="hidden" data-for="help_for_download">
                           <?=gettext("(Kbits/second)");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_upload" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Maximum Upload Speed");?></td>
                       <td>
                         <input name="upload" type="text" value="<?=$pconfig['upload'];?>" />
-                        <output class="hidden" for="help_for_upload">
+                        <div class="hidden" data-for="help_for_upload">
                           <?=gettext("(Kbits/second)");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
@@ -275,27 +275,27 @@ include("head.inc");
                       <td><a id="help_for_logpackets" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Log NAT-PMP");?></td>
                       <td>
                        <input name="logpackets" type="checkbox" value="yes" <?=!empty($pconfig['logpackets']) ? "checked=\"checked\"" : ""; ?> />
-                       <output class="hidden" for="help_for_logpackets">
+                       <div class="hidden" data-for="help_for_logpackets">
                          <?=gettext("Log packets handled by UPnP and NAT-PMP rules?");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_sysuptime" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use system time");?></td>
                       <td>
                        <input name="sysuptime" type="checkbox" value="yes" <?=!empty($pconfig['sysuptime']) ? "checked=\"checked\"" : ""; ?> />
-                       <output class="hidden" for="help_for_sysuptime">
+                       <div class="hidden" data-for="help_for_sysuptime">
                          <?=gettext("Use system uptime instead of UPnP and NAT-PMP service uptime?");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_permdefault" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Default deny");?></td>
                       <td>
                        <input name="permdefault" type="checkbox" value="yes" <?=!empty($pconfig['permdefault']) ? "checked=\"checked\"" : ""; ?> />
-                       <output class="hidden" for="help_for_permdefault">
+                       <div class="hidden" data-for="help_for_permdefault">
                          <?=gettext("By default deny access to UPnP and NAT-PMP?");?>
-                       </output>
+                       </div>
                       </td>
                     </tr>
                   </tbody>
@@ -317,37 +317,37 @@ include("head.inc");
                       <td style="width:22%"><a id="help_for_permuser1" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Set 1");?></td>
                       <td style="width:78%">
                         <input name="permuser1" type="text" value="<?=$pconfig['permuser1'];?>" />
-                        <output class="hidden" for="help_for_permuser1">
+                        <div class="hidden" data-for="help_for_permuser1">
                           <?=gettext("Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/cdir] [int port or range]");?><br/>
                           <?=gettext("Example: allow 1024-65535 192.168.0.0/24 1024-65535");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_permuser2" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Set 2");?></td>
                       <td>
                         <input name="permuser2" type="text" value="<?=$pconfig['permuser2'];?>" />
-                        <output class="hidden" for="help_for_permuser2">
+                        <div class="hidden" data-for="help_for_permuser2">
                           <?=gettext("Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/cdir] [int port or range]");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_permuser3" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Set 3");?></td>
                       <td>
                         <input name="permuser3" type="text" value="<?=$pconfig['permuser3'];?>" />
-                        <output class="hidden" for="help_for_permuser3">
+                        <div class="hidden" data-for="help_for_permuser3">
                           <?=gettext("Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/cdir] [int port or range]");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td><a id="help_for_permuser4" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Set 4");?></td>
                       <td>
                         <input name="permuser4" type="text" value="<?=$pconfig['permuser4'];?>" />
-                        <output class="hidden" for="help_for_permuser4">
+                        <div class="hidden" data-for="help_for_permuser4">
                           <?=gettext("Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/cdir] [int port or range]");?>
-                        </output>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 583164443..8cc3cdbce 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		wol
 PLUGIN_VERSION=		1.0
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		wol
 PLUGIN_COMMENT=		Wake on LAN Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/wol/src/www/services_wol.php b/net/wol/src/www/services_wol.php
index 044520270..1055264b1 100644
--- a/net/wol/src/www/services_wol.php
+++ b/net/wol/src/www/services_wol.php
@@ -172,18 +172,18 @@ include("head.inc");
 <?php
                           endforeach; ?>
                           </select>
-                          <output class="hidden" for="help_for_interface">
+                          <div class="hidden" data-for="help_for_interface">
                             <?=gettext("Choose which interface the host to be woken up is connected to.");?>
-                          </output>
+                          </div>
                         </td>
                       </tr>
                       <tr>
                         <td><a id="help_for_mac" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("MAC address");?></td>
                         <td>
                           <input name="mac" type="text" id="mac" value="<?=!empty($_GET['mac']) ? htmlspecialchars(strtolower(str_replace("-", ":", $_GET['mac']))) : "";?>" />
-                          <output class="hidden" for="help_for_mac">
+                          <div class="hidden" data-for="help_for_mac">
                             <?=sprintf(gettext("Enter a MAC address %sin the following format: xx:xx:xx:xx:xx:xx%s"),'<strong>','</strong>');?>
-                          </output>
+                          </div>
                         </td>
                       </tr>
                       <tr>
diff --git a/net/wol/src/www/services_wol_edit.php b/net/wol/src/www/services_wol_edit.php
index 28cdf1096..d29f579b3 100644
--- a/net/wol/src/www/services_wol_edit.php
+++ b/net/wol/src/www/services_wol_edit.php
@@ -125,27 +125,27 @@ legacy_html_escape_form_data($pconfig);
 <?php
                       endforeach; ?>
                       </select>
-                      <output class="hidden" for="help_for_interface">
+                      <div class="hidden" data-for="help_for_interface">
                         <?=gettext("Choose which interface this host is connected to.");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_mac" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("MAC address");?></td>
                     <td>
                       <input name="mac" type="text" value="<?=$pconfig['mac'];?>" />
-                      <output class="hidden" for="help_for_mac">
+                      <div class="hidden" data-for="help_for_mac">
                         <?=gettext("Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>
                     <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
                     <td>
                       <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
-                      <output class="hidden" for="help_for_descr">
+                      <div class="hidden" data-for="help_for_descr">
                         <?=gettext("You may enter a description here for your reference (not parsed).");?>
-                      </output>
+                      </div>
                     </td>
                   </tr>
                   <tr>