fixed rootform issues with deeper forms and added choice expaded template