Added NoSwap tag checking to Logic.