more fixes for the redirect in dialogs (WIP)