Fix dlentry and dl id attribute generation #1765