Added Folder and Adv. Filter Support