Refactor EAV form for Range