Corrected logic fail on whitelisted terms