microsoft · vishwacsena · Apr 24, 2020 · Apr 14, 2020 · Apr 14, 2020 · Apr 23, 2020
diff --git a/packages/lu/src/parser/qna/qnamaker/qnaConverter.js b/packages/lu/src/parser/qna/qnamaker/qnaConverter.js
@@ -27,8 +27,8 @@ const qnaToLuContent = function(qnaJSON){
     }
 
     root.forEach(function(qnaItem) {
-        fileContent += qnaItem.id.toString() !== "0" ? `<a id = "${qnaItem.id}"></a>` + NEWLINE + NEWLINE : '';
         fileContent += '> !# @qna.pair.source = ' + qnaItem.source + NEWLINE + NEWLINE;
+        fileContent += qnaItem.id.toString() !== "0" ? `<a id = "${qnaItem.id}"></a>` + NEWLINE + NEWLINE : '';
         fileContent += '## ? ' + qnaItem.questions[0] + NEWLINE;
         qnaItem.questions.splice(0,1);
         qnaItem.questions.forEach(function(question) {

diff --git a/packages/lu/test/fixtures/testcases/qnaref.qna b/packages/lu/test/fixtures/testcases/qnaref.qna
@@ -1,4 +1,4 @@
-> !# @qna.source=hand added
+> !# @qna.pair.source=hand added
 # ?hello
 - [another](./collate/1.lu#Greeting)
 **Filters:**

diff --git a/packages/lu/test/fixtures/verified/allGenQnA.lu b/packages/lu/test/fixtures/verified/allGenQnA.lu
@@ -2,6 +2,8 @@
 
 > !# @qna.pair.source = custom editorial
 
+<a id = "181"></a>
+
 ## ? How do I change the default message
 
 ```markdown

diff --git a/packages/luis/test/fixtures/testcases/qnaref.qna b/packages/luis/test/fixtures/testcases/qnaref.qna
@@ -1,4 +1,4 @@
-> !# @qna.source=hand added
+> !# @qna.pair.source=hand added
 # ?hello
 - [another](./collate/1.lu#Greeting)
 **Filters:**

diff --git a/packages/qnamaker/test/fixtures/testcases/qnaref.qna b/packages/qnamaker/test/fixtures/testcases/qnaref.qna
@@ -1,4 +1,4 @@
-> !# @qna.source=hand added
+> !# @qna.pair.source=hand added
 # ?hello
 - [another](./collate/1.lu#Greeting)
 **Filters:**

diff --git a/packages/qnamaker/test/fixtures/verified/MultiturnReplaceKbWithFlattenedTree.qna b/packages/qnamaker/test/fixtures/verified/MultiturnReplaceKbWithFlattenedTree.qna
@@ -1,9 +1,9 @@
 > # QnA pairs
 
-<a id = "1"></a>
-
 > !# @qna.pair.source = Editorial
 
+<a id = "1"></a>
+
 ## ? ques1
 
 ```markdown
@@ -15,40 +15,40 @@ ans1
 - [p2](#3) `context-only`
 - [p3](#4)
 
-<a id = "2"></a>
-
 > !# @qna.pair.source = Editorial
 
+<a id = "2"></a>
+
 ## ? p1
 
 ```markdown
 ap1
 ```
 
-<a id = "3"></a>
-
 > !# @qna.pair.source = Editorial
 
+<a id = "3"></a>
+
 ## ? p2
 
 ```markdown
 ap2
 ```
 
-<a id = "4"></a>
-
 > !# @qna.pair.source = Editorial
 
+<a id = "4"></a>
+
 ## ? p3
 
 ```markdown
 ap3
 ```
 
-<a id = "5"></a>
-
 > !# @qna.pair.source = Editorial
 
+<a id = "5"></a>
+
 ## ? qew
 
 ```markdown

diff --git a/packages/qnamaker/test/fixtures/verified/multiturn.json.qna b/packages/qnamaker/test/fixtures/verified/multiturn.json.qna
@@ -1,9 +1,9 @@
 > # QnA pairs
 
-<a id = "1"></a>
-
 > !# @qna.pair.source = xyz
 
+<a id = "1"></a>
+
 ## ? hello
 
 **Filters:**
@@ -18,51 +18,51 @@ hi there
 - [flight booking](#32) `context-only`
 - [weather](#2) `context-only`
 
-<a id = "2"></a>
-
 > !# @qna.pair.source = custom editorial
 
+<a id = "2"></a>
+
 ## ? weather
 
 ```markdown
 sure will get weather
 ```
 
-<a id = "3"></a>
-
 > !# @qna.pair.source = custom editorial
 
+<a id = "3"></a>
+
 ## ? q2
 - tell me a joke
 
 ```markdown
 ha ha ha
 ```
 
-<a id = "32"></a>
-
 > !# @qna.pair.source = custom editorial
 
+<a id = "32"></a>
+
 ## ? book flight
 
 ```markdown
 sure. happy to help with that.
 ```
 
-<a id = "4"></a>
-
 > !# @qna.pair.source = custom editorial
 
+<a id = "4"></a>
+
 ## ? batata
 
 ```markdown
 tomato
 ```
 
-<a id = "5"></a>
-
 > !# @qna.pair.source = custom editorial
 
+<a id = "5"></a>
+
 ## ? testquestion
 
 ```markdown

diff --git a/packages/qnamaker/test/fixtures/verified/qna5.json b/packages/qnamaker/test/fixtures/verified/qna5.json
@@ -4,7 +4,7 @@
     {
       "id": 0,
       "answer": "hi there",
-      "source": "custom editorial",
+      "source": "hand added",
       "questions": [
         "hello",
         "Hi",