Fix etl extraction specs (fix #367)
Update scheduler