Allow sort by weight
Refactor addsubscription to match backend changes