diff --git a/Configuration/FlexForm/Flexform.xml b/Configuration/FlexForm/Flexform.xml
index 0f72656..46a8db9 100644
--- a/Configuration/FlexForm/Flexform.xml
+++ b/Configuration/FlexForm/Flexform.xml
@@ -2,32 +2,32 @@
     <sheets>
         <main>
             <ROOT>
-                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_main</sheetTitle>
+                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_main</sheetTitle>
                 <type>array</type>
                 <el>
                     <settings.flexform.showSearch>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.showSearch</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.showSearch</label>
                         <config>
                             <type>check</type>
                             <default>0</default>
                         </config>
                     </settings.flexform.showSearch>
                     <settings.flexform.showNumberOfResults>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.showResultsNumber</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.showResultsNumber</label>
                         <config>
                             <type>check</type>
                             <default>0</default>
                         </config>
                     </settings.flexform.showNumberOfResults>
                     <settings.flexform.showQuestionCommentForm>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.showQuestionCommentForm</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.showQuestionCommentForm</label>
                         <config>
                             <type>check</type>
                             <default>0</default>
                         </config>
                     </settings.flexform.showQuestionCommentForm>
                     <settings.question.comment.email.enable>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.question.comment.email.enable</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.question.comment.email.enable</label>
                         <onChange>reload</onChange>
                         <config>
                             <type>check</type>
@@ -35,14 +35,14 @@
                         </config>
                     </settings.question.comment.email.enable>
                     <settings.flexform.showCategoriesCommentForm>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.showCategoriesCommentForm</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.showCategoriesCommentForm</label>
                         <config>
                             <type>check</type>
                             <default>0</default>
                         </config>
                     </settings.flexform.showCategoriesCommentForm>
                     <settings.category.comment.email.enable>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.category.comment.email.enable</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.category.comment.email.enable</label>
                         <onChange>reload</onChange>
                         <config>
                             <type>check</type>
@@ -50,19 +50,23 @@
                         </config>
                     </settings.category.comment.email.enable>
                     <settings.excludeAlreadyDisplayedQuestions>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.excludeAlreadyDisplayedQuestions</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.excludeAlreadyDisplayedQuestions</label>
                         <config>
                             <type>check</type>
                             <default>1</default>
                         </config>
                     </settings.excludeAlreadyDisplayedQuestions>
                     <settings.flexform.selectCategory>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.selectCategory</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.selectCategory</label>
                         <config>
                             <type>select</type>
                             <renderType>selectMultipleSideBySide</renderType>
                             <foreign_table>tx_jpfaq_domain_model_category</foreign_table>
-                            <foreign_table_where>ORDER BY category</foreign_table_where>
+                            <foreign_table_where>
+                                AND (0 IN (###PAGE_TSCONFIG_IDLIST###) OR {#tx_jpfaq_domain_model_category}.{#pid} IN (###PAGE_TSCONFIG_IDLIST###))
+                                AND {#tx_jpfaq_domain_model_category}.{#sys_language_uid} IN (-1, ###REC_FIELD_sys_language_uid###)
+                                ORDER BY category
+                            </foreign_table_where>
                             <multiple>0</multiple>
                             <size>10</size>
                             <maxitems>100</maxitems>
@@ -83,54 +87,54 @@
         </main>
         <questionComment>
             <ROOT>
-                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm</sheetTitle>
+                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm</sheetTitle>
                 <displayCond>FIELD:main.settings.question.comment.email.enable:=:1</displayCond>
                 <type>array</type>
                 <el>
                     <settings.question.comment.email.subject>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.question.comment.email.subject>
                     <settings.question.comment.email.sender.name>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.senderName</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.senderName</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.question.comment.email.sender.name>
                     <settings.question.comment.email.sender.email>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.senderEmail</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.senderEmail</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.question.comment.email.sender.email>
                     <settings.question.comment.email.receivers.email>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.receivers</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.receivers</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.question.comment.email.receivers.email>
                     <settings.question.comment.email.introText>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.introText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.introText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
                         </config>
                     </settings.question.comment.email.introText>
                     <settings.question.comment.email.closeText>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.closeText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.closeText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
                         </config>
                     </settings.question.comment.email.closeText>
                     <settings.question.comment.email.sendCommenterNotification>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.sendCommenterNotification</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.sendCommenterNotification</label>
                         <onChange>reload</onChange>
                         <config>
                             <type>check</type>
@@ -139,14 +143,14 @@
                     </settings.question.comment.email.sendCommenterNotification>
                     <settings.question.comment.email.commenter.subject>
                         <displayCond>FIELD:questionComment.settings.question.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
                         <config>
                             <type>input</type>
                         </config>
                     </settings.question.comment.email.commenter.subject>
                     <settings.question.comment.email.commenter.introText>
                         <displayCond>FIELD:questionComment.settings.question.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.introText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.introText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
@@ -154,7 +158,7 @@
                     </settings.question.comment.email.commenter.introText>
                     <settings.question.comment.email.commenter.closeText>
                         <displayCond>FIELD:questionComment.settings.question.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.closeText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.closeText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
@@ -165,54 +169,54 @@
         </questionComment>
         <categoryComment>
             <ROOT>
-                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_categoryCommentForm</sheetTitle>
+                <sheetTitle>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_categoryCommentForm</sheetTitle>
                 <displayCond>FIELD:main.settings.category.comment.email.enable:=:1</displayCond>
                 <type>array</type>
                 <el>
                     <settings.category.comment.email.subject>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.category.comment.email.subject>
                     <settings.category.comment.email.sender.name>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.senderName</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.senderName</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.category.comment.email.sender.name>
                     <settings.category.comment.email.sender.email>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.senderEmail</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.senderEmail</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.category.comment.email.sender.email>
                     <settings.category.comment.email.receivers.email>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.receivers</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.receivers</label>
                         <config>
                             <type>input</type>
                             <eval>trim</eval>
                         </config>
                     </settings.category.comment.email.receivers.email>
                     <settings.category.comment.email.introText>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.introText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.introText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
                         </config>
                     </settings.category.comment.email.introText>
                     <settings.category.comment.email.closeText>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.closeText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.closeText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
                         </config>
                     </settings.category.comment.email.closeText>
                     <settings.category.comment.email.sendCommenterNotification>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.sendCommenterNotification</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.sendCommenterNotification</label>
                         <onChange>reload</onChange>
                         <config>
                             <type>check</type>
@@ -221,14 +225,14 @@
                     </settings.category.comment.email.sendCommenterNotification>
                     <settings.category.comment.email.commenter.subject>
                         <displayCond>FIELD:categoryComment.settings.category.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.subject</label>
                         <config>
                             <type>input</type>
                         </config>
                     </settings.category.comment.email.commenter.subject>
                     <settings.category.comment.email.commenter.introText>
                         <displayCond>FIELD:categoryComment.settings.category.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.introText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.introText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
@@ -236,7 +240,7 @@
                     </settings.category.comment.email.commenter.introText>
                     <settings.category.comment.email.commenter.closeText>
                         <displayCond>FIELD:categoryComment.settings.category.comment.email.sendCommenterNotification:=:1</displayCond>
-                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xfl:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.closeText</label>
+                        <label>LLL:EXT:jpfaq/Resources/Private/Language/locallang_db.xlf:tx_jpfaq_flexform.sheet_questionCommentForm.commenter.closeText</label>
                         <config>
                             <type>text</type>
                             <enableRichtext>1</enableRichtext>
@@ -246,4 +250,4 @@
             </ROOT>
         </categoryComment>
     </sheets>
-</T3DataStructure>
\ No newline at end of file
+</T3DataStructure>