merge edit form fix from Mattrice