Fix issues when enabled in both Today and All.