Fix bug on upcoming page. Fix from barriespotter/Web_App