diff --git a/node/main-support.ts b/node/main-support.ts
index 1429d246..3de345de 100644
--- a/node/main-support.ts
+++ b/node/main-support.ts
@@ -276,9 +276,8 @@ export function createDotPlsFile(savePath: string, playlist: ImageElement[], sou
 export function cleanUpFileName(original: string): string {
   return original.split('.').slice(0, -1).join('.')   // (1)
                  .split('_').join(' ')                // (2)
-                 .split('-').join(' ')                // (3)
-                 .split('.').join(' ')                // (4)
-                 .split(/\s+/).join(' ')              // (5)
+                 .split('.').join(' ')                // (3)
+                 .split(/\s+/).join(' ')              // (4)
 }
 
 /**
diff --git a/package-lock.json b/package-lock.json
index 345dc61b..3ad9d2b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "video-hub-app-3",
-  "version": "3.1.0",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/app/pipes/file-search.pipe.ts b/src/app/pipes/file-search.pipe.ts
index bebc90db..ff115b61 100644
--- a/src/app/pipes/file-search.pipe.ts
+++ b/src/app/pipes/file-search.pipe.ts
@@ -69,8 +69,8 @@ export class FileSearchPipe implements PipeTransform {
               searchString += ' ' + item.partialPath.replace(/(\/)/, ' ');
             }
           }
-          const regex = new RegExp(`\\b${element.toLowerCase()}`, 'i');
-          if (regex.test(searchString.toLowerCase())) {
+
+          if (searchString.toLowerCase().indexOf(element.toLowerCase()) !== -1) {
             matchFound++;
           }
         });
diff --git a/src/app/pipes/magic-search.pipe.ts b/src/app/pipes/magic-search.pipe.ts
index 92021219..b580a7e8 100644
--- a/src/app/pipes/magic-search.pipe.ts
+++ b/src/app/pipes/magic-search.pipe.ts
@@ -17,11 +17,9 @@ export class MagicSearchPipe implements PipeTransform {
       return finalArray;
     } else {
       // console.log('magic search pipe working');
-      const regex = new RegExp(`\\b${searchString.toLowerCase()}`, 'i');
       return finalArray.filter(item =>
-        regex.test(item.partialPath.toLowerCase())
-        || (regex.test(item.fileName.toLowerCase())
-        || regex.test(item.cleanName.toLowerCase()))
+        item.partialPath.toLowerCase().indexOf(searchString.toLowerCase()) !== -1
+        || item.fileName.toLowerCase().indexOf(searchString.toLowerCase()) !== -1
       );
     }
   }