Thank you page and redirection fixes