Fixed some bugs with the edit arbor create overriding edit when creating data items.