merge in PLH changes to avoid sub-forms by generating form content