A few fixes found while testing

mostly some things in reports and paid subscriptions, adapting to the changes

also fixes #999 well thats not really an error, but I think its needed