Allow custome user agent on HTTP check
Refactor the queue handling better