[642] Make sure we add the core-dataset field to the schema and update when indexing