Refactor and properly set the published_on date