WC-233 #comment bugs fix

fixed classnames