fix some issues for cheerio