Fixes #843 did a quick test, will test again before merge.
Closes #842
 Filtering subscriptions by access rights works correctly, now looking into improving code to be more reusuable
Merge branch '4.2-dev' into newdev