Allow correct sorting for invoice and shipping addresses