Issue #591 - Optimize downloads import