diff --git a/form/res-judicata/src/components/edit/Guide.vue b/form/res-judicata/src/components/edit/Guide.vue
index f90688e..f346b40 100644
--- a/form/res-judicata/src/components/edit/Guide.vue
+++ b/form/res-judicata/src/components/edit/Guide.vue
@@ -294,11 +294,13 @@ export default {
     watch: {
         selected:{
             handler(newVal) {
+                const addressFields = newVal.fulladdress.split(", ");
+
                 this.zaloba.soud.nazev = newVal.name || ""
-                this.zaloba.soud.sidlo.uliceacislopopisne = newVal.address.split(", ")[0]|| ""
-                this.zaloba.soud.sidlo.mesto = newVal.address.split(", ")[1] || ""
-                this.zaloba.soud.sidlo.psc = ""
-                this.zaloba.soud.sidlo.stat = "Česká republika"
+                this.zaloba.soud.sidlo.uliceacislopopisne = addressFields[0]|| ""
+                this.zaloba.soud.sidlo.mesto = addressFields[addressFields.length-2].split(" ").slice(2).join(" ") || ""
+                this.zaloba.soud.sidlo.psc = addressFields[addressFields.length-2].split(" ").slice(0,2).join(" ") || ""
+                this.zaloba.soud.sidlo.stat = addressFields[addressFields.length-1] || ""
             },
             deep: true
         }
@@ -369,4 +371,4 @@ export default {
     },
 
 }
-</script>
\ No newline at end of file
+</script>