Changes to correct issue with page redirect