Fix bug with Entity state handle for editing session