Changed entity-id to be added as DOM attribute, rather than data attr

AFDP-51