diff --git a/spec/fixtures/db/dynamic_finders.yml b/spec/fixtures/db/dynamic_finders.yml
index 49e8392e..a3e8b9bb 100644
--- a/spec/fixtures/db/dynamic_finders.yml
+++ b/spec/fixtures/db/dynamic_finders.yml
@@ -114,6 +114,10 @@ wordpress:
     - wp-includes/css/dashicons.css
     - wp-admin/css/install.min.css
     - wp-admin/css/install.css
+    - wp-admin/css/forms.min.css
+    - wp-admin/css/forms.css
+    - wp-admin/css/l10n.min.css
+    - wp-admin/css/l10n.css
     confidence_per_occurence: 30
     version: true
   QueryParameterInUpgradePage:
@@ -123,8 +127,54 @@ wordpress:
     files:
     - wp-includes/css/buttons.min.css
     - wp-includes/css/buttons.css
+    - wp-includes/css/dashicons.min.css
+    - wp-includes/css/dashicons.css
     - wp-admin/css/install.min.css
     - wp-admin/css/install.css
+    - wp-admin/css/forms.min.css
+    - wp-admin/css/forms.css
+    - wp-admin/css/l10n.min.css
+    - wp-admin/css/l10n.css
+    confidence_per_occurence: 30
+    version: true
+  QueryParameterInRepairPage:
+    class: QueryParameter
+    path: wp-admin/maint/repair.php
+    xpath: //link[contains(@href,"wp-includes/css/") or contains(@href,"wp-admin/css/")]/@href
+    files:
+    - wp-includes/css/buttons.min.css
+    - wp-includes/css/buttons.css
+    - wp-includes/css/dashicons.min.css
+    - wp-includes/css/dashicons.css
+    - wp-admin/css/install.min.css
+    - wp-admin/css/install.css
+    - wp-admin/css/forms.min.css
+    - wp-admin/css/forms.css
+    - wp-admin/css/l10n.min.css
+    - wp-admin/css/l10n.css
+    confidence_per_occurence: 30
+    version: true
+  QueryParameterInLoginPage:
+    class: QueryParameter
+    path: wp-login.php
+    xpath: //link[contains(@href,"wp-includes/css/") or contains(@href,"wp-admin/css/")]/@href|//script[contains(@src,"wp-includes/js/") or contains(@src,"wp-admin/js/")]/@src
+    files:
+    - wp-includes/css/dashicons.min.css
+    - wp-includes/css/dashicons.css
+    - wp-includes/css/buttons.min.css
+    - wp-includes/css/buttons.css
+    - wp-admin/css/login.min.css
+    - wp-admin/css/login.css
+    - wp-admin/css/forms.min.css
+    - wp-admin/css/forms.css
+    - wp-admin/css/l10n.min.css
+    - wp-admin/css/l10n.css
+    - wp-admin/js/password-strength-meter.min.js
+    - wp-admin/js/password-strength-meter.js
+    - wp-includes/js/wp-util.min.js
+    - wp-includes/js/wp-util.js
+    - wp-admin/js/user-profile.min.js
+    - wp-admin/js/user-profile.js
     confidence_per_occurence: 30
     version: true
   SitemapGenerator:
diff --git a/spec/fixtures/dynamic_finders/expected.yml b/spec/fixtures/dynamic_finders/expected.yml
index fa3ed326..16e1570c 100644
--- a/spec/fixtures/dynamic_finders/expected.yml
+++ b/spec/fixtures/dynamic_finders/expected.yml
@@ -94,14 +94,42 @@ wordpress:
     - http://wp.lab/wp-admin/css/install.min.css?ver=3.8.1
     - http://wp.lab/wp-admin/css/install.css?ver=3.8.1
     - http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1
   QueryParameterInUpgradePage:
     number: 3.8.1
     found_by: Query Parameter In Upgrade Page (Aggressive Detection)
-    confidence: 90
+    confidence: 100
     interesting_entries:
     - http://wp.lab/wp-includes/css/buttons.min.css?ver=3.8.1
     - http://wp.lab/wp-admin/css/install.min.css?ver=3.8.1
     - http://wp.lab/wp-admin/css/install.css?ver=3.8.1
+    - http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1
+  QueryParameterInRepairPage:
+    number: 3.8.1
+    found_by: Query Parameter In Repair Page (Aggressive Detection)
+    confidence: 100
+    interesting_entries:
+    - http://wp.lab/wp-includes/css/buttons.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/install.min.css?ver=3.8.1
+    - http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1
+  QueryParameterInLoginPage:
+    number: 3.8.1
+    found_by: Query Parameter In Login Page (Aggressive Detection)
+    confidence: 100
+    interesting_entries:
+    - http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1
+    - http://wp.lab/wp-includes/css/buttons.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/css/login.min.css?ver=3.8.1
+    - http://wp.lab/wp-admin/js/password-strength-meter.min.js?ver=3.8.1
+    - http://wp.lab/wp-includes/js/wp-util.min.js?ver=3.8.1
+    - http://wp.lab/wp-admin/js/user-profile.min.js?ver=3.8.1
   SitemapGenerator:
     number: 4.0
     found_by: Sitemap Generator (Aggressive Detection)
diff --git a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_install_page/wp-admin/install.php b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_install_page/wp-admin/install.php
index c2981836..bfb5fb8c 100644
--- a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_install_page/wp-admin/install.php
+++ b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_install_page/wp-admin/install.php
@@ -11,6 +11,10 @@
 <link rel='stylesheet' id='install-css'  href='http://wp.lab/wp-admin/css/install.css?ver=3.8.1' type='text/css' media='all' />
 
 <link rel='stylesheet' id='dashicons-css'  href='http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1' type='text/css' media='all' />
+
+<link rel='stylesheet' id='forms-css'  href='http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1' type='text/css' media='all' />
+
+<link rel='stylesheet' id='l10n-css'  href='http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1' type='text/css' media='all' />
 </head>
 <body class="wp-core-ui">
 <p id="logo"><a href="https://wordpress.org/" tabindex="-1">WordPress</a></p>
diff --git a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_login_page/wp-login.php b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_login_page/wp-login.php
new file mode 100644
index 00000000..8c550dbc
--- /dev/null
+++ b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_login_page/wp-login.php
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+  <!--[if IE 8]>
+    <html xmlns="http://www.w3.org/1999/xhtml" class="ie8" lang="en-US">
+  <![endif]-->
+  <!--[if !(IE 8) ]><!-->
+    <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+  <!--<![endif]-->
+  <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>Log In &lsaquo; WP 3.8.1 &#8212; WordPress</title>
+  <link rel='dns-prefetch' href='//s.w.org' />
+<link rel='stylesheet' id='dashicons-css'  href='http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='buttons-css'  href='http://wp.lab/wp-includes/css/buttons.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='forms-css'  href='http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='l10n-css'  href='http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='login-css'  href='http://wp.lab/wp-admin/css/login.min.css?ver=3.8.1' media='all' />
+  <meta name='robots' content='noindex,noarchive' />
+  <meta name='referrer' content='strict-origin-when-cross-origin' />
+    <meta name="viewport" content="width=device-width" />
+    </head>
+  <body class="login no-js login-action-login wp-core-ui  locale-en-us">
+  <script type="text/javascript">
+    document.body.className = document.body.className.replace('no-js','js');
+  </script>
+    <div id="login">
+    <h1><a href="https://wordpress.org/">Powered by WordPress</a></h1>
+
+    <form name="loginform" id="loginform" action="http://wp.lab/wp-login.php" method="post">
+      <p>
+        <label for="user_login">Username or Email Address</label>
+        <input type="text" name="log" id="user_login" class="input" value="" size="20" autocapitalize="off" />
+      </p>
+
+      <div class="user-pass-wrap">
+        <label for="user_pass">Password</label>
+        <div class="wp-pwd">
+          <input type="password" name="pwd" id="user_pass" class="input password-input" value="" size="20" />
+          <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="Show password">
+            <span class="dashicons dashicons-visibility" aria-hidden="true"></span>
+          </button>
+        </div>
+      </div>
+            <p class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme" value="forever"  /> <label for="rememberme">Remember Me</label></p>
+      <p class="submit">
+        <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="Log In" />
+                  <input type="hidden" name="redirect_to" value="http://wp.lab/wp-admin/" />
+                  <input type="hidden" name="testcookie" value="1" />
+      </p>
+    </form>
+
+          <p id="nav">
+                  <a href="http://wp.lab/wp-login.php?action=lostpassword">Lost your password?</a>
+                </p>
+          <script type="text/javascript">
+      function wp_attempt_focus() {setTimeout( function() {try {d = document.getElementById( "user_login" );d.focus(); d.select();} catch( er ) {}}, 200);}
+wp_attempt_focus();
+if ( typeof wpOnload === 'function' ) { wpOnload() }    </script>
+        <p id="backtoblog"><a href="http://wp.lab/">
+    &larr; Back to WP 3.8.1   </a></p>
+      </div>
+  <script src='http://wp.lab/wp-includes/js/jquery/jquery.js?ver=1.12.4-wp'></script>
+<script src='http://wp.lab/wp-includes/js/jquery/jquery-migrate.min.js?ver=1.4.1'></script>
+<script>
+var _zxcvbnSettings = {"src":"http:\/\/wp.lab\/wp-includes\/js\/zxcvbn.min.js"};
+</script>
+<script src='http://wp.lab/wp-includes/js/zxcvbn-async.min.js?ver=1.0'></script>
+<script>
+var pwsL10n = {"unknown":"Password strength unknown","short":"Very weak","bad":"Weak","good":"Medium","strong":"Strong","mismatch":"Mismatch"};
+</script>
+<script src='http://wp.lab/wp-admin/js/password-strength-meter.min.js?ver=3.8.1'></script>
+<script src='http://wp.lab/wp-includes/js/underscore.min.js?ver=1.8.3'></script>
+<script>
+var _wpUtilSettings = {"ajax":{"url":"\/wp-admin\/admin-ajax.php"}};
+</script>
+<script src='http://wp.lab/wp-includes/js/wp-util.min.js?ver=3.8.1'></script>
+<script>
+var userProfileL10n = {"warn":"Your new password has not been saved.","warnWeak":"Confirm use of weak password","show":"Show","hide":"Hide","cancel":"Cancel","ariaShow":"Show password","ariaHide":"Hide password"};
+</script>
+<script src='http://wp.lab/wp-admin/js/user-profile.min.js?ver=3.8.1'></script>
+  <script>
+  /(trident|msie)/i.test(navigator.userAgent)&&document.getElementById&&window.addEventListener&&window.addEventListener("hashchange",function(){var t,e=location.hash.substring(1);/^[A-z0-9_-]+$/.test(e)&&(t=document.getElementById(e))&&(/^(?:a|select|input|button|textarea)$/i.test(t.tagName)||(t.tabIndex=-1),t.focus())},!1);
+  </script>
+    <div class="clear"></div>
+  </body>
+  </html>
diff --git a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_repair_page/wp-admin/maint/repair.php b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_repair_page/wp-admin/maint/repair.php
new file mode 100644
index 00000000..606639b5
--- /dev/null
+++ b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_repair_page/wp-admin/maint/repair.php
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="robots" content="noindex,nofollow" />
+  <title>WordPress &rsaquo; Database Repair</title>
+  <link rel='stylesheet' id='dashicons-css'  href='http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='buttons-css'  href='http://wp.lab/wp-includes/css/buttons.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='forms-css'  href='http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='l10n-css'  href='http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1' media='all' />
+<link rel='stylesheet' id='install-css'  href='http://wp.lab/wp-admin/css/install.min.css?ver=3.8.1' media='all' />
+</head>
+<body class="wp-core-ui">
+<p id="logo"><a href="https://wordpress.org/">WordPress</a></p>
+
+<h1 class="screen-reader-text">Allow automatic database repair</h1><p>To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p></body>
+</html>
diff --git a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_upgrade_page/wp-admin/upgrade.php b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_upgrade_page/wp-admin/upgrade.php
index 5784653e..7c271b31 100644
--- a/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_upgrade_page/wp-admin/upgrade.php
+++ b/spec/fixtures/dynamic_finders/wp_version/query_parameter_in_upgrade_page/wp-admin/upgrade.php
@@ -10,6 +10,12 @@
 
 <link rel='stylesheet' id='install-css'  href='http://wp.lab/wp-admin/css/install.css?ver=3.8.1' type='text/css' media='all' />
 
+<link rel='stylesheet' id='dashicons-css'  href='http://wp.lab/wp-includes/css/dashicons.min.css?ver=3.8.1' type='text/css' media='all' />
+
+<link rel='stylesheet' id='forms-css'  href='http://wp.lab/wp-admin/css/forms.min.css?ver=3.8.1' type='text/css' media='all' />
+
+<link rel='stylesheet' id='l10n-css'  href='http://wp.lab/wp-admin/css/l10n.min.css?ver=3.8.1' type='text/css' media='all' />
+
 <!--[if lte IE 7]>
 <link rel='stylesheet' id='ie-css'  href='http://wp.lab/wp-admin/css/ie.min.css?ver=3.8.1' type='text/css' media='all' />
 <![endif]-->