solved one of the found issues on form editing