Fix status retrieval to be order-agnostic
Merge branch 'statuses_ordering'