fixed repopulated fields with restricted field sets
initial testcases
removed initial group when saving container