better automatic insertion of Form tags