diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js
index 9f53147b2..a704001b4 100644
--- a/files/assets/js/comments_v.js
+++ b/files/assets/js/comments_v.js
@@ -91,26 +91,6 @@ document.getElementById("reportCommentButton").onclick = function() {
 
 };
 
-document.addEventListener("DOMContentLoaded", function () {
-
-    document.getElementById('reportCommentModal').addEventListener('hidden.bs.modal', function () {
-
-        var button = document.getElementById("reportCommentButton");
-
-        var beforeModal = document.getElementById("reportCommentFormBefore");
-        var afterModal = document.getElementById("reportCommentFormAfter");
-
-        button.innerHTML = 'Report comment';
-        button.disabled = false;
-        afterModal.classList.add('d-none');
-
-        if (beforeModal.classList.contains('d-none')) {
-            beforeModal.classList.remove('d-none');
-        }
-
-    });
-})
-
 function openReplyBox(id) {
     const element = document.getElementById(`reply-to-${id}`);
     element.classList.remove('d-none')
@@ -178,6 +158,9 @@ post_reply=function(id){
 
     document.getElementById('save-reply-to-'+id).classList.add('disabled');
 
+    document.querySelectorAll('[data-src]').forEach(elem => {
+        elem.src = elem.dataset.src;
+    })
 }
 
 comment_edit=function(id){
@@ -211,6 +194,9 @@ comment_edit=function(id){
     }
     xhr.send(form)
 
+    document.querySelectorAll('[data-src]').forEach(elem => {
+        elem.src = elem.dataset.src;
+    })
 }
 
 post_comment=function(fullname){
diff --git a/files/assets/js/report_post_modal.js b/files/assets/js/report_post_modal.js
index 281504c63..9f8de416c 100644
--- a/files/assets/js/report_post_modal.js
+++ b/files/assets/js/report_post_modal.js
@@ -24,22 +24,4 @@ report_postModal = function(id) {
         xhr.send(form);
 
     }
-};
-
-document.getElementById('reportPostModal').addEventListener('hidden.bs.modal', function () {
-
-    var button = document.getElementById("reportPostButton");
-
-    var beforeModal = document.getElementById("reportPostFormBefore");
-    var afterModal = document.getElementById("reportPostFormAfter");
-
-    button.innerHTML='Report post';
-    button.disabled= false;
-
-    afterModal.classList.add('d-none');
-
-    if ( beforeModal.classList.contains('d-none') ) {
-        beforeModal.classList.remove('d-none');
-    }
-
-});
+};
\ No newline at end of file
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 239db932a..dd0f48e76 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -33,7 +33,7 @@
 
 {% if v %}
 	{% include "award_modal.html" %}
-	<script src="/assets/js/comments_v.js?v=4"></script>
+	<script src="/assets/js/comments_v.js?v=5"></script>
 {% endif %}
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index cf5b8c732..798f0d724 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -1,4 +1,4 @@
-<script src="/assets/js/report_post_modal.js?v=1"></script>
+<script src="/assets/js/report_post_modal.js?v=2"></script>
 
 <div class="modal fade" id="reportPostModal" tabindex="-1" role="dialog" aria-labelledby="reportPostModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
diff --git a/files/templates/settings.html b/files/templates/settings.html
index b58536252..984746473 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -24,11 +24,6 @@
 			id3.classList.remove("d-none");
 		});
 		
-		document.getElementById('2faModal').addEventListener('hidden.bs.modal', function () {
-			var box = document.getElementById("2faToggle");
-			box.checked = !box.checked;
-		});
-
 		function emailVerifyText() {
 			document.getElementById("email-verify-text").innerHTML = "Verification email sent! Please check your inbox.";
 		}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 79dffd4a3..e5cc9bf2b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -36,7 +36,7 @@
 
 {% if 'marsey.tech' in request.host %}
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=4"></script>
+		<script src="/assets/js/comments_v.js?v=5"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}