diff --git a/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs b/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs
index 78f84d0eb..53ebb2986 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             var pathToFile = mapper.Map(resourceUrl);
             var hash = _hashProvider.ComputeMd5(pathToFile).ToBase64();
 
-            return resourceUrl + "?h=" + hash;
+            return resourceUrl + "?h=" + hash.Trim('=');
         }
 
         private static bool ShouldBreakCache(string path)
diff --git a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
index 3b09cfdf9..c90fc7381 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Api.Frontend.Mappers
         private readonly IAnalyticsService _analyticsService;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
-        private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src|data-main)=\").*?(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src)=\").*?(css|js)(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static String API_KEY;
         private static String URL_BASE;