Fixed some problems with form filling.  More testing is ređuired.