Fix form annotations not showing in composer