Reduce number of queries in Cart reconstruction