WP-2354 changes related to field_citation