EAV extract format

These should match strings better (with a follow up that the strings should be different as well).