diff --git a/src/main/java/common/PluginUpdater.java b/src/main/java/common/PluginUpdater.java
index 02f73e7..c83cce2 100644
--- a/src/main/java/common/PluginUpdater.java
+++ b/src/main/java/common/PluginUpdater.java
@@ -2043,6 +2043,10 @@ private boolean handleJenkinsDownload(String key, Map.Entry<String, String> entr
             jenkinsLink = value.substring(0, value.indexOf(multiIdentifier));
         } else {
             jenkinsLink = value;
+            int qi = jenkinsLink.indexOf('?');
+            if (qi != -1) {
+                jenkinsLink = jenkinsLink.substring(0, qi);
+            }
         }
         if (!jenkinsLink.endsWith("/")) {
             jenkinsLink += "/";
@@ -2070,7 +2074,7 @@ private boolean handleJenkinsDownload(String key, Map.Entry<String, String> entr
                 selectedArtifact = artifact;
                 break;
             }
-            if (times == artifactNum) {
+            if (getRegexJ == null && times == artifactNum) {
                 selectedArtifact = artifact;
                 break;
             }