BZ1014071 - DataModelOracle: Performance issues when model is large. Fix editor issues