diff --git a/OurUmbraco/Repository/Services/PackageRepositoryService.cs b/OurUmbraco/Repository/Services/PackageRepositoryService.cs
index ed5a2c92..11876ae0 100644
--- a/OurUmbraco/Repository/Services/PackageRepositoryService.cs
+++ b/OurUmbraco/Repository/Services/PackageRepositoryService.cs
@@ -373,6 +373,8 @@ namespace OurUmbraco.Repository.Services
                 .Where(x => x.PackageVersion != null && x.MinUmbracoVersion != null)
                 .OrderByDescending(x => x.PackageVersion)
                 .ThenByDescending(x => x.MinUmbracoVersion)
+                //need to sort by latest file Id too since multiple files can target the same umbraco versions but we want to take the latest uploaded file
+                .ThenByDescending(x => x.FileId)
                 .ToArray();
             return allVersions;
         }
@@ -392,6 +394,8 @@ namespace OurUmbraco.Repository.Services
                 .Select(x => new PackageVersionSupport(x.Id, x.Version.Version.GetFromUmbracoString(reduceToConfigured:false), null))
                 .Where(x => x.PackageVersion != null)
                 .OrderByDescending(x => x.PackageVersion)
+                //need to sort by latest file Id too since multiple files can target the same umbraco versions but we want to take the latest uploaded file
+                .ThenByDescending(x => x.FileId)
                 .ToArray();
             return allVersions;
         }     
diff --git a/OurUmbraco/Wiki/BusinessLogic/WikiFile.cs b/OurUmbraco/Wiki/BusinessLogic/WikiFile.cs
index bab1628e..6e1bf55d 100644
--- a/OurUmbraco/Wiki/BusinessLogic/WikiFile.cs
+++ b/OurUmbraco/Wiki/BusinessLogic/WikiFile.cs
@@ -415,11 +415,12 @@ namespace OurUmbraco.Wiki.BusinessLogic
         public static List<UmbracoVersion> GetVersionsFromString(string p)
         {
             var umbracoVersions = new List<UmbracoVersion>();
+            var availableVersions = UmbracoVersion.AvailableVersions();
 
             foreach (var ver in p.Split(','))
             {
-                if (UmbracoVersion.AvailableVersions().ContainsKey(ver))
-                    umbracoVersions.Add(UmbracoVersion.AvailableVersions()[ver]);
+                if (availableVersions.ContainsKey(ver))
+                    umbracoVersions.Add(availableVersions[ver]);
             }
 
             return umbracoVersions;