resorting context endpoints, belong with mobile spec