Fixed problems with adding a serial and special chars in filenames