- Added queue filtering