Fix simple field handling during import / first save