Refactor es-clause element
Add annex attribute and display appropriately