KF-87 - form now loading correctly in builder