Improve ACCOUNT_SUBSCRIPTION API resource (issue #1788)