Fixed issues with downloads in folders

-Erwin