fetcher task & small fix schema