Ensuring collections are correctly annotated with their respective element in queries
Regenerating with updated collection entry annotations