Refs #4798 - Fixing the subscription API

- [x] Fix tests
- [x] Update UI