Removed subtree hardcoding for filters