Use EFQ Extra Fields for performance