Week/Month Switch works now