diff --git a/assets/ts/definitions/properties.ts b/assets/ts/definitions/properties.ts
index 0282a12..cab8a85 100644
--- a/assets/ts/definitions/properties.ts
+++ b/assets/ts/definitions/properties.ts
@@ -46,6 +46,7 @@ export const GetOriginalJson = () : JsonProfiler => {
 export const RestoreOriginalJson = () => {
     if (originalJson) {
         json = originalJson;
+        originalJson = null;
     }
 }
 
@@ -119,7 +120,7 @@ export const GetAction = () : ActionTypes => {
  * Set the current action
  */
 export const SetAction = (status: ActionTypes) => {
-    action === 'opened' ? SaveItem('data-waterfall-status', 'opened') : DeleteItem('data-waterfall-status');
+    status === 'opened' ? SaveItem('data-waterfall-status', 'opened') : DeleteItem('data-waterfall-status');
     SetWrapperAttribute({
         'data-status': status === 'minimize' ? 'opened' : status,
         style: null
diff --git a/assets/ts/runner.ts b/assets/ts/runner.ts
index 0868ade..09b3f13 100644
--- a/assets/ts/runner.ts
+++ b/assets/ts/runner.ts
@@ -423,11 +423,7 @@ export default (): void => {
                     SetAttribute(tabElements['benchmark'], {
                         'data-filter': null,
                     });
-                    if (lastSeverity !== 'all') {
-                        renderBenchmark('all');
-                    } else {
-                        renderBenchmark('all', lastSearch, true);
-                    }
+                    renderBenchmark(null, lastSearch, true);
                     return;
                 }
                 SetAttribute(headerFilter, {
diff --git a/dist/waterfall.js b/dist/waterfall.js
index 587f7a8..287a810 100644
--- a/dist/waterfall.js
+++ b/dist/waterfall.js
@@ -2600,6 +2600,7 @@ const GetOriginalJson = () => {
 const RestoreOriginalJson = () => {
     if (originalJson) {
         json = originalJson;
+        originalJson = null;
     }
 };
 /**
@@ -2663,7 +2664,7 @@ const GetAction = () => {
  * Set the current action
  */
 const SetAction = (status) => {
-    action === 'opened' ? (0,_functions__WEBPACK_IMPORTED_MODULE_0__.SaveItem)('data-waterfall-status', 'opened') : (0,_functions__WEBPACK_IMPORTED_MODULE_0__.DeleteItem)('data-waterfall-status');
+    status === 'opened' ? (0,_functions__WEBPACK_IMPORTED_MODULE_0__.SaveItem)('data-waterfall-status', 'opened') : (0,_functions__WEBPACK_IMPORTED_MODULE_0__.DeleteItem)('data-waterfall-status');
     SetWrapperAttribute({
         'data-status': status === 'minimize' ? 'opened' : status,
         style: null
@@ -3174,12 +3175,7 @@ const removeCode = () => {
                     (0,_definitions_functions__WEBPACK_IMPORTED_MODULE_0__.SetAttribute)(tabElements['benchmark'], {
                         'data-filter': null,
                     });
-                    if (lastSeverity !== 'all') {
-                        renderBenchmark('all');
-                    }
-                    else {
-                        renderBenchmark('all', lastSearch, true);
-                    }
+                    renderBenchmark(null, lastSearch, true);
                     return;
                 }
                 (0,_definitions_functions__WEBPACK_IMPORTED_MODULE_0__.SetAttribute)(headerFilter, {
@@ -6305,7 +6301,7 @@ module.exports = "<div data-waterfall=\"container\">\n    <div data-waterfall=\"
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	(() => {
-/******/ 		__webpack_require__.h = () => ("f2fddb5d750526706722")
+/******/ 		__webpack_require__.h = () => ("1a806b18a57d2ec118a3")
 /******/ 	})();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */