Updated generator to look for the correct elements; Updated link to use ID