Improved duplicate word prevention