some bug fixes on create-application-form