Better support of multipart filenames