Added possibility to filter on specific folder