update handleOrder fields to be consistent with Order class