Fix fetching items when a folder contains < 20 items
Refactor addData to use listcomprehension