diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
index 4872c050b4eec35dbb478b2799a72773ea1275c1..6ac455664ec62fe2027c8b3a234849cf13c0e294 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
@@ -191,9 +191,8 @@ export class CreateCommentComponent implements OnInit, OnDestroy {
         this.hasSpellcheckConfidence = false;
         return;
       }
-      console.log(document.getElementById('langSelect').innerText);
-      if(document.getElementById('langSelect').innerText.includes(this.newLang)
-            || document.getElementById('langSelect').innerText.includes('auto')){
+      if(this.selectedLang === 'auto' && (document.getElementById('langSelect').innerText.includes(this.newLang)
+        || document.getElementById('langSelect').innerText.includes('auto'))) {
         if(wordsCheck.language.name.includes('German')){
           this.selectedLang = 'de-DE';
         }else if(wordsCheck.language.name.includes('English')){
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
index ddbba87b0b707a8222aee559c598c06b1bcfbecb..08b3bc3013287e77f429ab46f042b13c2203e701 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
@@ -55,14 +55,15 @@
         </mat-list-item>
       </mat-list>
     </ars-row>
-    <span *ngIf="keywords.length <= 0 && !this.isLoading">
-      <p>{{ 'spacy-dialog.empty-nouns' | translate }}</p>
-    </span>
-    <span *ngIf="!langSupported">
-      <p class="manual-input-title">{{ 'spacy-dialog.add-manually' | translate }}</p>
-    <textarea class="manual-input" [(ngModel)]="manualKeywords" (input)="manualKeywordsToKeywords()"></textarea>
-    </span>
-
+    <ars-row>
+      <span *ngIf="keywords.length <= 0 && !this.isLoading">
+        <p>{{ 'spacy-dialog.empty-nouns' | translate }}</p>
+      </span>
+      <span *ngIf="!langSupported">
+        <p class="manual-input-title">{{ 'spacy-dialog.add-manually' | translate }}</p>
+        <textarea class="manual-input" [(ngModel)]="manualKeywords" (input)="manualKeywordsToKeywords()"></textarea>
+      </span>
+    </ars-row>
   </div>
 </ars-row>
 
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.scss b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.scss
index 407db987196c4ad88ddcc5b8952f089b5c055331..81cd32b18d2a08e7bdd29411015eb614f8b12d03 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.scss
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.scss
@@ -50,10 +50,11 @@
 }
 .manual-input{
   background-color: transparent;
-    border: 1px solid var(--on-dialog);
-    padding: 5px;
-    border-radius: 5px;
-    color: var(--on-dialog);
+  border: 1px solid var(--on-dialog);
+  padding: 5px;
+  border-radius: 5px;
+  color: var(--on-dialog);
+  width: 100%
 }
 .manual-input-title{
   margin-top: 15px;
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
index 462da0dcd7bd0ac2f628c6d6916d11ef5adcdc76..21fba67a837cb439826a942dd74129aa650b58d8 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
@@ -27,8 +27,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
   keywordsOriginal: Keyword[] = [];
   isLoading = false;
   langSupported = true;
-  manualKeywords : string = "";
-
+  manualKeywords = '';
 
   constructor(
     protected langService: LanguageService,
@@ -56,14 +55,13 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
 
   buildCreateCommentActionCallback() {
     return () => {
-      this.comment.keywordsFromQuestioner = this.keywords.filter(kw => kw.selected).map(kw => kw.word);
-      this.comment.keywordsFromSpacy = this.keywordsOriginal.map(kw => kw.word);
+      this.comment.keywordsFromQuestioner = this.keywords.filter(kw => kw.selected && kw.word.length).map(kw => kw.word);
+      this.comment.keywordsFromSpacy = this.keywordsOriginal.filter(kw => kw.word.length).map(kw => kw.word);
       this.dialogRef.close(this.comment);
     };
   }
 
   evalInput(model: Model) {
-  
     const keywords: Keyword[] = [];
     let regex;
     if(this.commentLang === 'de') {
@@ -76,7 +74,6 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
       this.langSupported = false;
       return;
     }
-   
     this.isLoading = true;
 
     // N at first pos = all Nouns(NN de/en) including singular(NN, NNP en), plural (NNPS, NNS en), proper Noun(NNE, NE de)
@@ -95,8 +92,10 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
             }
           }
         }
-        this.keywords = keywords;
-        this.keywordsOriginal = keywords;
+
+        // Deep copy
+        this.keywords = JSON.parse(JSON.stringify(keywords));
+        this.keywordsOriginal = JSON.parse(JSON.stringify(keywords));;
       }, () => {
         this.keywords = [];
         this.keywordsOriginal = [];
@@ -132,14 +131,18 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
   }
 
   manualKeywordsToKeywords(){
-    let tempKeywords = this.manualKeywords.replace(/\s/g,'').split(",");
-    this.keywords = tempKeywords.map((keyword)=>{
-      return {
-        "word": keyword,
-        "completed": true,
-        "editing": false,
-        "selected": true
-      }
-    })
+    const tempKeywords = this.manualKeywords.replace(/\s/g,'');
+    if(tempKeywords.length) {
+      this.keywords = tempKeywords.split(',').map((keyword) => (
+         {
+            word: keyword,
+            completed: true,
+            editing: false,
+            selected: true
+        }
+      ));
+    } else {
+      this.keywords = [];
+    }
   }
 }