Fix a couple bugs with redirection to incorrect page and trying to display announcement where one isn't available