Issue #1399964, Make sure calendar paths all take into account arguments ahead of the calendar arguments when creating links.