Notification query fix
Permissions fix
Merge branch 'hotfix/hotfix'