fix order fetching