Small fix to filename generator. Base folder is now added as well