diff --git a/html/js/librenms.js b/html/js/librenms.js
index 59595a7137..ecbe1b892c 100644
--- a/html/js/librenms.js
+++ b/html/js/librenms.js
@@ -66,8 +66,19 @@ function submitCustomRange(frmdata) {
     var refrom = /from=([0-9a-zA-Z\-])+/g;
     var tsto = $("#dtpickerto").data("DateTimePicker").date().unix();
     var tsfrom = $("#dtpickerfrom").data("DateTimePicker").date().unix();
-    frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto);
-    frmdata.selfaction.value = frmdata.selfaction.value.replace(refrom, 'from=' + tsfrom);
+
+    if (frmdata.selfaction.value.match(reto)) {
+        frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto);
+    } else {
+        frmdata.selfaction.value += '/to=' + tsto;
+    }
+
+    if (frmdata.selfaction.value.match(refrom)) {
+        frmdata.selfaction.value = frmdata.selfaction.value.replace(refrom, 'from=' + tsfrom);
+    } else {
+        frmdata.selfaction.value += '/from=' + tsfrom;
+    }
+
     frmdata.action = frmdata.selfaction.value;
     return true;
 }
diff --git a/resources/views/layouts/librenmsv1.blade.php b/resources/views/layouts/librenmsv1.blade.php
index 8573c6739a..38d1aeb3ac 100644
--- a/resources/views/layouts/librenmsv1.blade.php
+++ b/resources/views/layouts/librenmsv1.blade.php
@@ -76,7 +76,7 @@
         });
         var ajax_url = "{{ url('/ajax') }}";
     </script>
-    <script src="{{ asset('js/librenms.js?ver=31012024') }}"></script>
+    <script src="{{ asset('js/librenms.js?ver=14042024') }}"></script>
     <script type="text/javascript" src="{{ asset('js/overlib_mini.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/flasher.min.js?ver=0.6.1') }}"></script>
     <script type="text/javascript" src="{{ asset('js/toastr.min.js?ver=05072021') }}"></script>