Holidays module improvements

Changes have been separated in different commits