Fix aspect of specific_dates handling