Updated fetching of orders