That last commit for reordering by published_at was far from complete. This should do it though, and I am also throwing in some clean ups [#47341185]