[NUCMONGODB-136] Add more resilient logic to order/range handling to
allow previous contrib to work yet allow other cases to work too