fixes #857 - Support album subfolders