fix fields handling for new forms