Update list scripts to work on non-uploaded data as well