diff --git a/wax-questions-service/src/NumericalAnswerService/components/NumericalAnswerContainerComponent.js b/wax-questions-service/src/NumericalAnswerService/components/NumericalAnswerContainerComponent.js
index a80946804905dbe899283b3b6ff884cba7935819..23ff560a389d474d2058f2b1facd2e44a370a145 100644
--- a/wax-questions-service/src/NumericalAnswerService/components/NumericalAnswerContainerComponent.js
+++ b/wax-questions-service/src/NumericalAnswerService/components/NumericalAnswerContainerComponent.js
@@ -54,8 +54,9 @@ export default ({ node, view, getPos }) => {
   const {
     options,
     pmViews: { main },
+    setOption,
   } = context;
-  const [answerType, setAnswerType] = useState(node.attrs.answerType);
+
   const customProps = main.props.customValues;
   const { testMode } = customProps;
 
@@ -81,11 +82,8 @@ export default ({ node, view, getPos }) => {
   };
 
   useEffect(() => {
-    const allNodes = getNodes(context.pmViews.main);
-    allNodes.forEach(singleNode => {
-      if (singleNode.node.attrs.id === node.attrs.id) {
-        setAnswerType(singleNode.node.attrs.answerType);
-      }
+    setOption({
+      [node.attrs.id]: { numericalAnswer: node.attrs.answerType },
     });
   }, []);
 
@@ -113,19 +111,16 @@ export default ({ node, view, getPos }) => {
           view={view}
         />
         <NumericalAnswerOption>
-          {!options[node.attrs.id] && answerType === '' && (
+          {options[node.attrs.id]?.numericalAnswer === '' && (
             <>No Type Selected</>
           )}
-          {(options[node.attrs.id]?.numericalAnswer === 'exactAnswer' ||
-            answerType === 'exactAnswer') && (
+          {options[node.attrs.id]?.numericalAnswer === 'exactAnswer' && (
             <ExactAnswerComponent node={node} />
           )}
-          {(options[node.attrs.id]?.numericalAnswer === 'rangeAnswer' ||
-            answerType === 'rangeAnswer') && (
+          {options[node.attrs.id]?.numericalAnswer === 'rangeAnswer' && (
             <RangeAnswerComponent node={node} />
           )}
-          {(options[node.attrs.id]?.numericalAnswer === 'preciseAnswer' ||
-            answerType === 'preciseAnswer') && (
+          {options[node.attrs.id]?.numericalAnswer === 'preciseAnswer' && (
             <PreciseAnswerComponent node={node} />
           )}
         </NumericalAnswerOption>
diff --git a/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js b/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
index e4ee4770c2dd5b69be575fb9af7e9a0426aa5dc5..ad9d36ac2c5beb622f765f76f710f84e5fb6bf90 100644
--- a/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
+++ b/wax-questions-service/src/NumericalAnswerService/components/RangeAnswerComponent.js
@@ -47,7 +47,7 @@ const RangeAnswerComponent = ({ node }) => {
       if (singleNode.node.attrs.id === node.attrs.id) {
         const obj = {
           minAnswer: onlyNumbers(minRef.current.value),
-          maxError: onlyNumbers(maxRef.current.value),
+          maxAnswer: onlyNumbers(maxRef.current.value),
         };
 
         context.pmViews.main.dispatch(