Fixes Multiple entries in Queue

Fixes multiple entries in Queue table