change some instances of 'entry' to 'withurl'