Corrected issues with generated links