Merge branch 'hotfix/broke_something_when_trying_to_economise_showif'
fix reminders now that we're limiting the tables by user
Merge branch 'hotfix/fix_reminder_sending' into develop