diff --git a/client/src/components/Items/ItemsMultiSelect.js b/client/src/components/Items/ItemsMultiSelect.js
index 1ff5a7d24..e0875e3fa 100644
--- a/client/src/components/Items/ItemsMultiSelect.js
+++ b/client/src/components/Items/ItemsMultiSelect.js
@@ -38,9 +38,6 @@ export function ItemsMultiSelect({
     [isItemSelected],
   );
 
-  // Count selected items.
-  const countSelected = localSelected.length;
-
   // Handle item selected.
   const handleItemSelect = useCallback(
     ({ id }) => {
@@ -77,13 +74,16 @@ export function ItemsMultiSelect({
     [],
   );
 
+  // Count selected items.
+  const countSelected = itemsSelected().length;
+
   // Clear Button
   const clearButton =
     countSelected > 0 ? (
       <Button
         icon="cross"
         minimal={true}
-        onClick={() => setLocalSelected([])}
+        // onClick={() => setLocalSelected([])}
       />
     ) : undefined;
 
@@ -98,9 +98,12 @@ export function ItemsMultiSelect({
       items={items}
       noResults={<MenuItem disabled={true} text={<T id={'No items'} />} />}
       itemRenderer={itemRenderer}
-      popoverProps={{ minimal: true }}
+      popoverProps={{
+        minimal: true,
+        usePortal: false,
+        targetTagName: 'div ',
+      }}
       selectedItems={itemsSelected()}
-      filterable={true}
       fill={true}
       onItemSelect={handleItemSelect}
       itemPredicate={filterItemsPredicater}
diff --git a/client/src/containers/GeneralSearch/Search.js b/client/src/containers/GeneralSearch/Search.js
index 10c26a463..6ab8af7b9 100644
--- a/client/src/containers/GeneralSearch/Search.js
+++ b/client/src/containers/GeneralSearch/Search.js
@@ -11,11 +11,7 @@ function Search({
   openGlobalSearch,
   closeGlobalSearch,
 }) {
-  const items = [
-    { title: 'The Shawshank Redemption', year: 1994 },
-    { title: 'The Godfather', year: 1972 },
-    { title: 'The Godfather: Part II', year: 1974 },
-  ];
+  const items = [];
 
   const renderSearch = (search, { handleClick }) => (
     <MenuItem
diff --git a/client/src/containers/JournalNumber/ReferenceNumberForm.js b/client/src/containers/JournalNumber/ReferenceNumberForm.js
index 515061537..745a81e5a 100644
--- a/client/src/containers/JournalNumber/ReferenceNumberForm.js
+++ b/client/src/containers/JournalNumber/ReferenceNumberForm.js
@@ -4,6 +4,7 @@ import { Formik, Form } from 'formik';
 import { FormattedMessage as T } from 'components';
 import { Button, Classes } from '@blueprintjs/core';
 import { Intent } from '@blueprintjs/core';
+import intl from 'react-intl-universal';
 
 import 'style/pages/ReferenceNumber/ReferenceNumber.scss';
 
@@ -54,7 +55,9 @@ export default function ReferenceNumberForm({
         <Form className={'reference-number-form'}>
           <div className={Classes.DIALOG_BODY}>
             <p className="paragraph">
-              Your invoice numbers are set on auto-increment mod. Are you sure changing this setting?
+              {intl.get(
+                'your_invoice_numbers_are_set_on_auto_increment_mod_are_you_sure_changing_this_setting',
+              )}
             </p>
             <ReferenceNumberFormContent />
           </div>
diff --git a/client/src/containers/JournalNumber/ReferenceNumberFormContent.js b/client/src/containers/JournalNumber/ReferenceNumberFormContent.js
index 84d18562e..1b23e1fcc 100644
--- a/client/src/containers/JournalNumber/ReferenceNumberFormContent.js
+++ b/client/src/containers/JournalNumber/ReferenceNumberFormContent.js
@@ -17,7 +17,7 @@ export default function ReferenceNumberFormContent() {
       <FastField name={'incrementMode'}>
         {({ form, field, meta: { error, touched } }) => (
           <Radio
-            label="Auto-incrementing invoice number."
+            label={<T id={'auto_incrementing_number'} />}
             value="auto-increment"
             onChange={() => {
               form.setFieldValue('incrementMode', 'auto');
diff --git a/client/src/lang/ar-ly/index.json b/client/src/lang/ar-ly/index.json
index 46376f026..6a6e84ae4 100644
--- a/client/src/lang/ar-ly/index.json
+++ b/client/src/lang/ar-ly/index.json
@@ -1194,5 +1194,9 @@
   "Reports": "التقارير",
   "New tasks": "مهام جديدة",
   "sorry_about_that_something_went_wrong": "نتأسف بشأن ذلك! هناك خطأ ما",
-  "if_the_problem_stuck_please_contact_us_as_soon_as_possible": "إذا تكررت المشكلة اكتر من مرة ، الرجاء الاتصال بنا في أقرب وقت ممكن."
+  "if_the_problem_stuck_please_contact_us_as_soon_as_possible": "إذا تكررت المشكلة اكتر من مرة ، الرجاء الاتصال بنا في أقرب وقت ممكن.",
+  "non-inventory":"غير مخزون",
+  "terms_conditions":"الشروط والأحكام",
+  "your_invoice_numbers_are_set_on_auto_increment_mod_are_you_sure_changing_this_setting":"Your invoice numbers are set on auto-increment mod. Are you sure changing this setting?",
+  "auto_incrementing_number":"Auto-incrementing number"
 }
\ No newline at end of file
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json
index d1959570c..b066e794f 100644
--- a/client/src/lang/en/index.json
+++ b/client/src/lang/en/index.json
@@ -1181,5 +1181,9 @@
   "Reports": "Reports",
   "New tasks": "New tasks",
   "sorry_about_that_something_went_wrong": "Sorry about that! Something went wrong",
-  "if_the_problem_stuck_please_contact_us_as_soon_as_possible": "If the problem stuck, please contact us as soon as possible."
+  "if_the_problem_stuck_please_contact_us_as_soon_as_possible": "If the problem stuck, please contact us as soon as possible.",
+  "non-inventory":"Non-Inventory",
+  "terms_conditions":"Terms conditions",
+  "your_invoice_numbers_are_set_on_auto_increment_mod_are_you_sure_changing_this_setting":"Your invoice numbers are set on auto-increment mod. Are you sure changing this setting?",
+  "auto_incrementing_number":"Auto-incrementing number"
 }
\ No newline at end of file