Fixed nested forms issues