Fix CTCP queries again.