Fixed issues with order row lumping