Revert "Reverted back to semi-working state"

This reverts commit cbcef68b61ba3549504a741a2acb520a4bfc84e8.
AI-670 #close Fix readout of form instances