deleted 2 unused fields
added hidden field for address_type