WP-4733 Fix different fields in ct