Fix scoping/ordering on @default_collection setting (for new records)