More form refining before map is added