diff --git a/zero.Backoffice.UI/app/components/ui-add-button.vue b/zero.Backoffice.UI/app/components/ui-add-button.vue
index 3a21666d..b384bf7c 100644
--- a/zero.Backoffice.UI/app/components/ui-add-button.vue
+++ b/zero.Backoffice.UI/app/components/ui-add-button.vue
@@ -118,6 +118,10 @@
           });
         }
 
+        if (flavors.length > 0)
+        {
+          this.selectedflavor = flavors[0].alias;
+        }
         this.flavors = flavors;
       },
 
@@ -153,7 +157,7 @@
   })
 </script>
 
-<style>
+<style lang="scss">
   
   .ui-decision
   {
diff --git a/zero.Backoffice.UI/app/modules/countries/countries.vue b/zero.Backoffice.UI/app/modules/countries/countries.vue
index 2676f9d2..d2cc338b 100644
--- a/zero.Backoffice.UI/app/modules/countries/countries.vue
+++ b/zero.Backoffice.UI/app/modules/countries/countries.vue
@@ -17,7 +17,7 @@
       count: 0,
       createRoute: 'countries-edit'
     })
-
+   
     //methods: {
     //  async onAdd(flavor)
     //  {
diff --git a/zero.Backoffice.UI/app/modules/countries/country.vue b/zero.Backoffice.UI/app/modules/countries/country.vue
index a13cdcad..48d0c7a9 100644
--- a/zero.Backoffice.UI/app/modules/countries/country.vue
+++ b/zero.Backoffice.UI/app/modules/countries/country.vue
@@ -27,7 +27,7 @@
 
       async onLoad(form)
       {
-        const response = await form.load(() => this.id ? api.getById(this.id) : api.getEmpty(this.$route.query.flavor));
+        const response = await form.load(() => this.id ? api.getById(this.id) : api.getEmpty(this.$route.query['zero.flavor']));
         this.model = response;
       },
 
diff --git a/zero.Demo/Program.cs b/zero.Demo/Program.cs
index e5a75949..188118a1 100644
--- a/zero.Demo/Program.cs
+++ b/zero.Demo/Program.cs
@@ -29,8 +29,9 @@ builder.Services.Configure<FlavorOptions>(opts =>
 {
   opts.AddSpaceList<TeamMember>("team", "Team", "Members of our team", "fth-users", "spaces.team");
 
-  //opts.Add<Country, EuropeanCountry>("eu_country", "EU country", "A country within the European Union", "fth-globe");
-  //opts.Add<Country, AmericanCountry>("usa_country", "USA", "A country in the United States", "fth-flag");
+  opts.Configure<Country>(x => x.CanUseWithoutFlavors = false);
+  opts.Add<Country, EuropeanCountry>("eu_country", "EU country", "A country within the European Union", "fth-globe");
+  opts.Add<Country, AmericanCountry>("usa_country", "USA", "A country in the United States", "fth-flag");
 });
 
 builder.Services.Configure<BlueprintOptions>(opts =>