fix date and build extractor