Payload and Response Improvement

**Problem**
When wanting to display the selected Filters and/or Segments instead of getting that data from `orderMembers` in the payload and `annotations` in the response extra code is needed to parse that data from the metadata and/or other JSON properties.

**Solution**
Have the same output pattern followed for Filters and Segments to appear in `orderMembers` payload and `annotations` response

**Alternatives we've considered**
We've solved by writing additional logic, which does also add additional requests and we're trying to lower the number of requests.