Upload and collection list: performace improved withnew queries