Node queues creation (duplicates and fails) fix