Fixed calendar redirect issues