Holidays module improvements