Queues now allow termination.
Merge remote-tracking branch 'dacav/infrastucture' into infrastructure
Filter is even dummier...
Threaded version of lookup