[bug t881699] Sorting for webmaker:teach-
[cleanup] Wrapped makeapi-client instead of passing reference around
Changes