Added ids to the tags