Fix sort ordering.  Ensure collection_id is available for next change.
Fix sort ordering.  Ensure collection_id is available for next change.

lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch