Fixed Bug indexing core file fields