diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index c7440bfa9..75b26dc6f 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -355,7 +355,7 @@ function sanitizeProblemChars($str)
 /**
  *
  */
-function findResource($path, $resource, $subdir = false)
+function findResource($path, $resource, $subdir = false, $extraDir = null)
 {
 	// Place a / character at the and of the string if not present
 	if (strrpos($path, '/') < strlen($path) - 1) $path .= '/';
@@ -371,7 +371,14 @@ function findResource($path, $resource, $subdir = false)
 			// If entry is a directory but not the current and subdirectories should be loaded
 			if ($subdir === true && $entry != '.' && $entry != '..' && is_dir($path.$entry))
 			{
-				$tmpPaths[] = $path.$entry.'/';
+				if ($extension == null)
+				{
+					$tmpPaths[] = $path.$entry.'/';
+				}
+				else
+				{
+					$tmpPaths[] = $path.$entry.'/'.$extraDir.'/';
+				}
 			}
 		}
 		closedir($dirHandler);
diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index 549aa4dbf..49c89f814 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -142,7 +142,7 @@ class FilterCmptLib
 		}
 		else
 		{
-			$filePath = findResource(APPPATH.'components/extensions/', $this->_filterType, true);
+			$filePath = findResource(APPPATH.'components/extensions/', $this->_filterType, true, 'filters');
 			if (!isEmptyString($filePath)) require_once($filePath);
 		}
 
diff --git a/public/js/components/filter/API.js b/public/js/components/filter/API.js
index b4e45941b..9c208a08c 100644
--- a/public/js/components/filter/API.js
+++ b/public/js/components/filter/API.js
@@ -151,5 +151,5 @@ export const CoreFilterAPIs = {
                         }
                 );
 	}
-}
+};
 
diff --git a/public/js/components/navigation/API.js b/public/js/components/navigation/API.js
index 61ee4424a..57876102f 100644
--- a/public/js/components/navigation/API.js
+++ b/public/js/components/navigation/API.js
@@ -52,5 +52,5 @@ export const CoreNavigationAPIs = {
 			}
 		);
 	}
-}
+};