Changing because id's starting with numbers aren't allowed by html spec
Simplifiy extraction of ids