some fixes for data editing