added form fields and egeocoding