Added Back element_id for more precise URI reference.
Merge branch 'lduarte-annotation-retarget'