Fix redirect and fetch logic
Adjust item names