fix for the notifications and redirects