diff --git a/nse/http-info.nse b/nse/http-info.nse
index b3df74e..827212c 100644
--- a/nse/http-info.nse
+++ b/nse/http-info.nse
@@ -20,7 +20,6 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 
 portrule = shortport.service({"http", "https", "ssl"})
 
-
 local http = require "http"
 local stdnse = require "stdnse"
 
diff --git a/nse/smb-shares-size.nse b/nse/smb-shares-size.nse
index 70a3cd5..8b54bc8 100644
--- a/nse/smb-shares-size.nse
+++ b/nse/smb-shares-size.nse
@@ -1,7 +1,8 @@
-local stdnse = require "stdnse"
-local smb    = require "smb"
-local msrpc  = require "msrpc"
-local bin    = require "bin"
+local stdnse    = require "stdnse"
+local smb       = require "smb"
+local msrpc     = require "msrpc"
+local bin       = require "bin"
+local shortport = require "shortport"
 
 description = [[
 Return free and total size in octets of each SMB shares
@@ -25,9 +26,8 @@ categories = {"discovery", "intrusive"}
 author = "Adrien Malingrey"
 license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 
-hostrule = function(host)
-    return smb.get_port(host) ~= nil
-end
+portrule = shortport.service({"microsoft-ds", "netbios-ssn", "smb"})
+
 
 action = function(host)
   local status, shares, extra
diff --git a/results.xsl b/results.xsl
index 18b56e0..f5fec0f 100644
--- a/results.xsl
+++ b/results.xsl
@@ -142,10 +142,8 @@
     <xsl:variable name="scannedPort" select="$scannedHost/ports/port[service/@name=$serviceName or @portid=$serviceName][1]"/>
     <xsl:variable name="state">
         <xsl:choose>
-            <xsl:when test="$scannedPort/script[@id='http-info']/elem[@key='status']>=500">red</xsl:when>
-            <xsl:when test="$scannedPort/script[@id='http-info']/elem[@key='status']>=400">yellow</xsl:when>
-            <xsl:when test="$scannedPort/state/@state='filtered'">yellow</xsl:when>
             <xsl:when test="$scannedPort/state/@state='open'">green</xsl:when>
+            <xsl:when test="$scannedPort/state/@state='filtered'">yellow</xsl:when>
             <xsl:otherwise>red</xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
@@ -157,16 +155,12 @@
         <xsl:value-of select="$scannedPort/state/@state"/>
         <xsl:text> </xsl:text>
         <xsl:value-of select="$scannedPort/service/@name"/>
-        <xsl:if test="$scannedPort/script[@id='http-info']"><xsl:text>
-</xsl:text><xsl:value-of select="$scannedPort/script[@id='http-info']/elem[@key='status-line']"/>
-            <xsl:value-of select="$scannedPort/script[@id='http-info']/elem[@key='title']"/>
-        </xsl:if>
     </xsl:variable>
     <xsl:choose>
-        <xsl:when test="($scannedPort/service/@name='microsoft-ds' or $scannedPort/service/@name='netbios-ssn' or $scannedPort/service/@name='smb') and $scannedHost/hostscript/script[@id='smb-shares-size']">
+        <xsl:when test="$scannedPort/script[@id='smb-shares-size']/table">
             <div class="ui {$state} dropdown mini button share-size" title="{$title}">
                 <xsl:attribute name="style">
-                    <xsl:for-each select="$scannedHost/hostscript/script[@id='smb-shares-size']/table">
+                    <xsl:for-each select="$scannedPort/script[@id='smb-shares-size']/table">
                         <xsl:sort select="elem[@key='FreeSize'] div elem[@key='TotalSize']" order="ascending"/>
                         <xsl:if test="position()=1">
                             <xsl:text>--free: </xsl:text>
@@ -179,7 +173,7 @@
                 <xsl:value-of select="$serviceName"/>
                 <i class="dropdown icon"></i>
                 <div class="menu">
-                    <xsl:apply-templates select="$scannedHost/hostscript/script[@id='smb-shares-size']/table">
+                    <xsl:apply-templates select="$scannedPort/script[@id='smb-shares-size']/table">
                         <xsl:with-param name="scannedHostAddress" select="$scannedHostAddress"/>
                     </xsl:apply-templates>
                 </div>
@@ -190,6 +184,20 @@
                 <xsl:value-of select="$serviceName"/>
             </a>
         </xsl:when>
+        <xsl:when test="$scannedPort/script[@id='http-info']">
+            <xsl:variable name="status">
+                <xsl:choose>
+                    <xsl:when test="$scannedPort/script[@id='http-info']/elem[@key='status']>=500">red</xsl:when>
+                    <xsl:when test="$scannedPort/script[@id='http-info']/elem[@key='status']>=400">yellow</xsl:when>
+                    <xsl:when test="$scannedPort/script[@id='http-info']/elem[@key='status']>=200">green</xsl:when>
+                    <xsl:otherwise>red</xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <a class="ui {$status} mini button" href="{$scannedPort/service/@name}://{$scannedHostAddress}:{$scannedPort/@portid}"  target="_blank"
+            title="{$scannedPort/script[@id='http-info']/elem[@key='title' or @key='status-line']}">
+                <xsl:value-of select="$serviceName"/>
+            </a>
+        </xsl:when>
         <xsl:when test="$scannedPort/service/@name='ftp' or $scannedPort/service/@name='ssh' or $scannedPort/service/@name='http' or $scannedPort/service/@name='https'">
             <a class="ui {$state} mini button" href="{$scannedPort/service/@name}://{$scannedHostAddress}:{$scannedPort/@portid}"  target="_blank" title="{$title}">
                 <xsl:value-of select="$serviceName"/>