CHG: Reinclude layout selection in flexform