some cleanup and defining field types as email and tel when editing email and telephone nunmbers