Solve bugfixes related to the apply form