Fixed for null publish_until dates