#27 + correction markAsDowload & markAsNoDownload