Extra "on-entry" tag removed
Add editing support to the new expression property in the final state