more id fixes, memory with large numbers of 2k pending images