Refactoring to remove filters.php altogether