Fixed an issue where not setting default entries was creating group structures when they should be ommitted