Added file and folder filtering