Fix code review feedback, and a bug I just spotted where ad hoc ODATA queries would no longer be filtered to the correct curated feed package set.