diff --git a/package.json b/package.json
index 25ced7f..9100beb 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"",
     "clean": "rimraf dist/*",
-    "upgrade-form-control": "yarn upgrade bahmni-form-controls@0.94.0",
+    "upgrade-form-control": "yarn upgrade bahmni-form-controls@1.0.2",
     "copy": "copyfiles -f ./index.html ./dist",
     "build": "yarn run copy && webpack",
     "build-dev": "yarn run copy && webpack --config webpack.dev.config.js",
@@ -81,7 +81,7 @@
     "babel-loader": "^6.2.4",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.11.1",
-    "bahmni-form-controls": "^0.94.0",
+    "bahmni-form-controls": "1.0.2",
     "classnames": "^2.2.5",
     "codemirror": "^5.51.0",
     "core-js": "^2.4.1",
diff --git a/yarn.lock b/yarn.lock
index 47a40be..d01400d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1100,16 +1100,18 @@ backo2@1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-bahmni-form-controls@^0.94.0:
-  version "0.94.0"
-  resolved "https://registry.npmjs.org/bahmni-form-controls/-/bahmni-form-controls-0.94.0.tgz#726dc8701bb1bc06c972f2bcc5d4d2f75f110fe9"
-  integrity sha512-CsSFIJNNKxu0Opfp/rYrMDYuVd+cOmsMulWyCfP21qvS8y2aY4hHo+b+oxmA58J3nF8ANJB20i60guW1TSOY8Q==
+bahmni-form-controls@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bahmni-form-controls/-/bahmni-form-controls-1.0.2.tgz#f46842bef1f77a82d0ab90b9912d94067d8dc946"
+  integrity sha512-/f8FGDmBSjl7AusttOuJlx+Y3cn4HhpU/KLJDmep5HwzHn+JlK2Ql2DgQyonKghpdo5gUlYrgSL1UE86JlYLww==
   dependencies:
     base64-inline-loader "^1.1.0"
     classnames "^2.2.5"
     enzyme-adapter-react-16 "^1.1.0"
+    html-entities "^2.6.0"
     immutable "3.8.1"
     lodash "4.17.12"
+    moment "^2.29.1"
     prop-types "^15.6.2"
     react-intl "^3.12.0"
     react-select "^1.0.0-rc.2"
@@ -4333,6 +4335,11 @@ html-element-map@^1.2.0:
   dependencies:
     array-filter "^1.0.0"
 
+html-entities@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8"
+  integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
@@ -6014,6 +6021,11 @@ moment@^2.14.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
+moment@^2.29.1:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
+
 moo@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"