Switched from a@rel and form@name to a@id and form@id