Fix/generate form scope