WC-268 #comment search fixed