Fix rename of calendars, improve tasks count badge