Updated the queues so that we have filter per site

This is needed so that we can change the queue filters per site.
fixes