Fixed auto-increment filenames for subfolders