Fixed some problems in UI. Tested.
ERDBuilder: add the new entities to entityTypes map after splitting