Added trackingId to queue
Cleaned up completed download service (more methods)