Fixed date issues with quotes