Fix free_form and duplicates