fix date extractor move the escape charecter handling to the end