Only restore geometry for non custom attribute forms