Removed address links and changed type back to address_type