Duplicated covers message generate logic improvements