Fixing from faulty merge. Looks like it's fetching data properly again.