Improving entity edition. Fix in EntityDispatcher.