Fix data edit dialog after invalid calls introduced