FIX: Tags not saved, as statement was not executed
IMPROVE: Reduce amount of transitions, by not opening one when there is nothing to add