Multiple fixes:

- Fix id handling.
- Fix element tag.