Better NotInQueue checking