added entity tree
fix for split fields
fix for saving entity