diff --git a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
index 48c290cf..738fbfe2 100644
--- a/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
+++ b/src/components/screens/allCases/allCasesFilters/FiltersContainer.tsx
@@ -7,7 +7,8 @@ import {COLORS} from '../../../../../RN-UI-LIB/src/styles/colors';
 import {useSelector} from 'react-redux';
 import {RootState} from '../../../../store/store';
 import TextInput from '../../../../../RN-UI-LIB/src/components/TextInput';
-import CheckboxGroup from '../../../form/components/CheckboxGroup';
+import CheckboxGroup from '../../../../../RN-UI-LIB/src/components/chechbox/CheckboxGroup';
+// import CheckboxGroup from '../../../form/components/CheckboxGroup';
 
 interface FilterContainerProps {
     closeFilterModal: () => void;
@@ -22,13 +23,15 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
     const [filterSearchString, setFilterSearchString] =
         React.useState<string>('');
     const filterKeys = Object.keys(filters);
-    console.log(filterKeys);
-    const [selectedFilters, setSelectedFilters] = React.useState<Record<string, any>>({});
+    // console.log(filterKeys);
+    const [selectedFilters, setSelectedFilters] = React.useState<
+        Record<string, any>
+    >({});
     useEffect(() => {
         // console.log(JSON.stringify(selectedFilters));
-    },[selectedFilters]);
+    }, [selectedFilters]);
     const handleFilterSelection = (filterValues: any) => {
-        console.log(filterValues);
+        // console.log('filterValues..........', filterValues);
         selectedFilterKey &&
             setSelectedFilters({
                 ...selectedFilters,
@@ -36,12 +39,17 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
             });
     };
 
+    console.log("selectedFilters.......", selectedFilters)
+
     const Options = React.useMemo(() => {
         if (selectedFilterKey) {
             const options = filters[selectedFilterKey].options.filter(
                 option =>
                     option.label.toLowerCase().indexOf(filterSearchString) > -1,
             );
+            // console.log('options..........', options);
+            const selectedFilterValues = selectedFilters[selectedFilterKey]?.map((x: any) => x.value)
+            // console.log("selectedFilters", selectedFilterValues)
             return (
                 <View
                     style={[
@@ -52,12 +60,13 @@ const FiltersContainer: React.FC<FilterContainerProps> = props => {
                     <CheckboxGroup
                         onSelectionChange={handleFilterSelection}
                         options={options}
+                        defaultValue={selectedFilterValues}
                     />
                 </View>
             );
         }
         return <></>;
-    }, [selectedFilterKey]);
+    }, [selectedFilterKey, selectedFilters]);
 
     return (
         <View style={[GenericStyles.fill, {flex: 1}]}>