data editor fixes