Patched for CITEXT field support