diff --git a/CHANGELOG.md b/CHANGELOG.md
index 503138f4..2cdee703 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,151 +1,127 @@
 # Changelog
 
-## [v3.2.0](https://github.com/contentstack/live-preview-sdk/compare/v3.2.0...v3.2.0)
+## [v3.2.1](https://github.com/contentstack/live-preview-sdk/compare/v3.2.0...v3.2.1)
 
-> 11 April 2025
+> 23 April 2025
 
-### New Features
+### Fixes
 
-- feat(collab): add ui-components and collab feature handling (MohammedZuhairAhmed - [fa4daee](https://github.com/contentstack/live-preview-sdk/commit/fa4daee7c4d745b0ea0a2423667226698728f3fb))
-- feat(collab): open popup from rhs panel (MohammedZuhairAhmed - [e0ca1c2](https://github.com/contentstack/live-preview-sdk/commit/e0ca1c2b20d5b68f4ca49fef8c566ce62a0e0765))
-- feat(collab): add env based tree-shaking (MohammedZuhairAhmed - [33acd25](https://github.com/contentstack/live-preview-sdk/commit/33acd2517d0823aab0ca12fee99e75b94302c46e))
-- feat(collab): add retry mechanism for thread rendering (MohammedZuhairAhmed - [7f3b724](https://github.com/contentstack/live-preview-sdk/commit/7f3b724aef822c48b6383ce43d03e906c677b1bf))
-- feat(collab): pause collab mode in preview share (MohammedZuhairAhmed - [ae12b58](https://github.com/contentstack/live-preview-sdk/commit/ae12b587f44661d8797dcc62e95cbaae7baf9335))
-- feat(collab): delete thread when no comments present (Pratyush Biswas - [67a668d](https://github.com/contentstack/live-preview-sdk/commit/67a668dd330851073fef3240743d55e9545494b3))
-- feat: updates (Ashish Debnath - [1a2db18](https://github.com/contentstack/live-preview-sdk/commit/1a2db187daea2ec7307b12c0c8e52eae97aadf3f))
+- fix(collab): add optional chaining for tree shaking (Hitesh Shetty - [#431](https://github.com/contentstack/live-preview-sdk/pull/431))
+- fix: set unique ID on element click (Faraaz Biyabani - [#429](https://github.com/contentstack/live-preview-sdk/pull/429))
+- fix(VE-5803): sync field after custom space handling (Faraaz Biyabani - [#427](https://github.com/contentstack/live-preview-sdk/pull/427))
+- fix: space key handling for editable elements inside button (Faraaz Biyabani - [#419](https://github.com/contentstack/live-preview-sdk/pull/419))
+- fix(VE-4232): implement data-cslp mutation observer to manage unique IDs for elements (Sairaj - [#421](https://github.com/contentstack/live-preview-sdk/pull/421))
 
-### Fixes
+### General Changes
 
-- fix(collab): addressed PR comments (MohammedZuhairAhmed - [d57c2b3](https://github.com/contentstack/live-preview-sdk/commit/d57c2b3d3ca6d2b1d5d13965c77ef9b5c568696b))
-- fix(collab): stop event propagation of modals in collab mode and bug fixes (MohammedZuhairAhmed - [24c5a8b](https://github.com/contentstack/live-preview-sdk/commit/24c5a8b0f720dd171c87e679ee70a6d337975107))
-- fix(collab): disable buttons and icons until api processing is completed, add asyncloader component (MohammedZuhairAhmed - [f0214a5](https://github.com/contentstack/live-preview-sdk/commit/f0214a5ab05c4a4f79aac9dee1261331356df1a1))
-- fix(collab): bug fixes and code optimisations (MohammedZuhairAhmed - [94bca65](https://github.com/contentstack/live-preview-sdk/commit/94bca658d6fc963b361220de987a9b2510ea5af9))
-- fix(collab): addressed pr comments (MohammedZuhairAhmed - [94fc6cf](https://github.com/contentstack/live-preview-sdk/commit/94fc6cfa657a5dd5095ed644abeb6cce4e8d5276))
-- fix(collab): re-design of indicator and api changes (MohammedZuhairAhmed - [d37270c](https://github.com/contentstack/live-preview-sdk/commit/d37270ce0ae21b4cdc111a0e06d4102592bddb9e))
-- fix(collab): user tagging enhancements (diwakarmk7 - [1315762](https://github.com/contentstack/live-preview-sdk/commit/1315762472492eb81bf175b8e2b4a466c7088665))
-- fix: add check for list overflow (Pratyush Biswas - [cd8f6eb](https://github.com/contentstack/live-preview-sdk/commit/cd8f6eb5d0642b6578d324d6f25a6f5ba803391e))
-- fix(collab): highlight comment icon fix and code optimization (MohammedZuhairAhmed - [67d698e](https://github.com/contentstack/live-preview-sdk/commit/67d698e1b29c27c07360af09ba3ad5f9403deb28))
-- fix: update field event is not sent when input event does not occur in inline editable fields (Faraaz Biyabani - [f57744e](https://github.com/contentstack/live-preview-sdk/commit/f57744e1e5bbf77257ce2dee8c26548780c81069))
-- fix(collab): user tagging fix (MohammedZuhairAhmed - [27167c7](https://github.com/contentstack/live-preview-sdk/commit/27167c713552976836a4c5b61f4779659e6a0abb))
-- fix: threead position changes (Ashish Debnath - [fed3264](https://github.com/contentstack/live-preview-sdk/commit/fed3264ae8ccf416c16da7d3d751c59a8611d093))
-- fix(collab): added listener for new threads updated from state and bug fixes (MohammedZuhairAhmed - [1274bc3](https://github.com/contentstack/live-preview-sdk/commit/1274bc37e90f843761b1d653660d62c52786a00f))
-- fix(collab): made the inviteMetada to be updated when refreshed to get new comments (MohammedZuhairAhmed - [4f2f441](https://github.com/contentstack/live-preview-sdk/commit/4f2f44159f8d7898fd117cf7ab18f7783b7e6560))
-- fix(chore): add validations in textarea (Pratyush Biswas - [c130916](https://github.com/contentstack/live-preview-sdk/commit/c130916a7443742644e307814909979b5c522808))
-- fix(collab): fix bugs (MohammedZuhairAhmed - [d058d90](https://github.com/contentstack/live-preview-sdk/commit/d058d90eee063f828bc38d26fd40e5bd351eac55))
-- fix: updates (Ashish Debnath - [e6326b3](https://github.com/contentstack/live-preview-sdk/commit/e6326b3675bef9a835dd23a46f07640a6524bb7b))
-- fix(collab): address pr reviews (MohammedZuhairAhmed - [c5d9325](https://github.com/contentstack/live-preview-sdk/commit/c5d93252703b175152afe225e642608863c35ecb))
-- fix: test cae (Ashish Debnath - [a24e589](https://github.com/contentstack/live-preview-sdk/commit/a24e589e7de5da1d4b0880a004cda365cb7fde44))
-- fix(collab): remove unused styles (Pratyush Biswas - [e5acea6](https://github.com/contentstack/live-preview-sdk/commit/e5acea6ccda9f44e39f6d26f6836064f2089d70e))
-- fix(collab): fix cursor when hovering on popup (Pratyush Biswas - [9b288dc](https://github.com/contentstack/live-preview-sdk/commit/9b288dc65150e4596bbc9e125fb34f9894d15805))
-- fix: updates (Ashish Debnath - [469e98c](https://github.com/contentstack/live-preview-sdk/commit/469e98cbec8e5e3d99bb9391f72e89dd31932b84))
-- fix(collab): remove debugging elements (Pratyush Biswas - [752429b](https://github.com/contentstack/live-preview-sdk/commit/752429b343e40d033cf21f0efb23d9c648d79bdb))
+- Stage-v3.2.1 (Faraaz Biyabani - [#428](https://github.com/contentstack/live-preview-sdk/pull/428))
 
-### Chores And Housekeeping
+### Fixes
 
-- chore(collab): addressed pr comments (MohammedZuhairAhmed - [889a810](https://github.com/contentstack/live-preview-sdk/commit/889a810cccb7cf347253077eb5bdb27184c27e1a))
-- chore(collab): fix email styles (Pratyush Biswas - [0f979de](https://github.com/contentstack/live-preview-sdk/commit/0f979de6e654332bde33fb8bc88d68469343ed29))
+- fix: custom space key handling when a button element is on the composed path (Faraaz Biyabani - [5dc41a2](https://github.com/contentstack/live-preview-sdk/commit/5dc41a2bd277095008a7ccb7876a0c801d6932e6))
+- fix(collab): add optional chaining for tree shaking and fix unknown user issue (MohammedZuhairAhmed - [8710ac5](https://github.com/contentstack/live-preview-sdk/commit/8710ac5acae6075d8062158cb735f4037c2139ae))
+- fix: ensure process is defined (Faraaz Biyabani - [26e63f9](https://github.com/contentstack/live-preview-sdk/commit/26e63f91bba6bbb3e86423cb253c2527fdc8d102))
+- fix: use uuid v4 (Faraaz Biyabani - [063f81a](https://github.com/contentstack/live-preview-sdk/commit/063f81acdf9e2f7541664ea027b551570648723e))
+- fix: sync field after custom space handling (Faraaz Biyabani - [fd461a4](https://github.com/contentstack/live-preview-sdk/commit/fd461a4010ccf29d23f8480651ba13a4b93111b1))
 
-### Refactoring and Updates
+### Chores And Housekeeping
 
-- refactor(collab): addressed pr comments (MohammedZuhairAhmed - [2594bfc](https://github.com/contentstack/live-preview-sdk/commit/2594bfce49d18d44eeaa0312b0ba4d0afd1bc4ab))
-- refactor(collab): code optimisation and bug fixes (MohammedZuhairAhmed - [aad0e61](https://github.com/contentstack/live-preview-sdk/commit/aad0e61d42410284f053c151b9b76866b3d85381))
-- refactor(collab): addressed pr feedbacks (MohammedZuhairAhmed - [ad53532](https://github.com/contentstack/live-preview-sdk/commit/ad53532116e8c57986f38bc290121c91540bbdc4))
+- chore: merge branch main into develop_v3 (MohammedZuhairAhmed - [dcc3a10](https://github.com/contentstack/live-preview-sdk/commit/dcc3a10772a1e62231d7d69263734669bfb1b0eb))
+- chore: better names (Faraaz Biyabani - [a16dfe3](https://github.com/contentstack/live-preview-sdk/commit/a16dfe39de28bccffaf8dddb251982abbd79b8fa))
 
 ### Changes to Test Assests
 
-- test(collab): test cases addition and config updates (MohammedZuhairAhmed - [01bb128](https://github.com/contentstack/live-preview-sdk/commit/01bb1281cc206b67b2394c876b82903090fdaf86))
-- test(collab): add ui-components test cases (MohammedZuhairAhmed - [e0540ec](https://github.com/contentstack/live-preview-sdk/commit/e0540eced5f0ae89a71d363e160e6d79589f9844))
-- test(collab): fix failing test cases (Pratyush Biswas - [827d28c](https://github.com/contentstack/live-preview-sdk/commit/827d28ce814e6b97e2597185680809892b0a080e))
-- test(collab): add test cases for deleting thread when no comments (Pratyush Biswas - [ad95401](https://github.com/contentstack/live-preview-sdk/commit/ad9540156bb665199ae6d047c929f3f11f82aad9))
-- test(collab): added test cases (MohammedZuhairAhmed - [f02d09e](https://github.com/contentstack/live-preview-sdk/commit/f02d09e84b7651f3fa3ae85404e64ee8e6a59083))
-- test(collab): add corresponding test cases (Pratyush Biswas - [0b34034](https://github.com/contentstack/live-preview-sdk/commit/0b340341d1e58afdb6c2c2c51a0c1637cb8612b8))
-- test: update focusOverlayWrapper test (Faraaz Biyabani - [fb53c5e](https://github.com/contentstack/live-preview-sdk/commit/fb53c5edde64dc9d4474e019e75d1f38590e10b9))
+- test: udpate handleFieldKeyDown tests for space handling in button (Faraaz Biyabani - [fd886ac](https://github.com/contentstack/live-preview-sdk/commit/fd886aca36d608b57d122da86ab8b705d1fa8d78))
+- test: mock randomUUID from crypto module (Sairaj Chouhan - [0c8990b](https://github.com/contentstack/live-preview-sdk/commit/0c8990bdb3d14e18497101dccdb809ac7435330c))
 
 ### General Changes
 
-- tagging changes (diwakarmk7 - [266b495](https://github.com/contentstack/live-preview-sdk/commit/266b4951dcd9c8b61b564498eec7c12cf5dc55c9))
-- tagging users (diwakarmk7 - [0572101](https://github.com/contentstack/live-preview-sdk/commit/0572101e26057be942c992966b398743ae661528))
-- Revert "fix: update field event is not sent when input event does not occur in inline editable fields" (Faraaz Biyabani - [9180f84](https://github.com/contentstack/live-preview-sdk/commit/9180f84a1eaebb8179f2a766c310fb967fc48214))
-- Fix thread popup styles (Pratyush Biswas - [c7ed7a3](https://github.com/contentstack/live-preview-sdk/commit/c7ed7a393cf063a7706e2423fad3d4b62a9ab9bb))
-- suggestion scroll movement fix (diwakarmk7 - [2b3fef6](https://github.com/contentstack/live-preview-sdk/commit/2b3fef6a5b20395f64917f9742639386197ed701))
-- disable button changes (diwakarmk7 - [1d224a6](https://github.com/contentstack/live-preview-sdk/commit/1d224a6316db3baf1ebb53157a82a06448acea1b))
-- added disabled state for adding comment button (diwakarmk7 - [623163f](https://github.com/contentstack/live-preview-sdk/commit/623163f547b418e0049e04a2d2c662a1eea1154b))
-- tagging changes (diwakarmk7 - [1046ab6](https://github.com/contentstack/live-preview-sdk/commit/1046ab6f8845280c6c206d870241163bc5cbbc4a))
-- remove unused styles (Pratyush Biswas - [4288126](https://github.com/contentstack/live-preview-sdk/commit/42881260812aaede2ce38ba6d73e4ae1b7c71d22))
-- Fix resolve button style (Pratyush Biswas - [d9f5eea](https://github.com/contentstack/live-preview-sdk/commit/d9f5eea38a7c2e92f619a2d1e3ebb053073fd6ef))
-- added id to tousers list (diwakarmk7 - [e6adff3](https://github.com/contentstack/live-preview-sdk/commit/e6adff37f1e9e81f3053ad62cd0210da5e5926d6))
+- Delete jira.yml (Aravind Kumar - [80a496c](https://github.com/contentstack/live-preview-sdk/commit/80a496c805ce52542221f9bafa11116211f24f73))
+- issues-jira.yml (Aravind Kumar - [a429983](https://github.com/contentstack/live-preview-sdk/commit/a4299833949c80c274abd8af8ae81062fd78556f))
+- policy-scan.yml (Aravind Kumar - [a4b69a0](https://github.com/contentstack/live-preview-sdk/commit/a4b69a07a50b0d8145122bf99b330c3b22d91e8f))
+- Delete sast-scan.yml (Aravind Kumar - [c0bffef](https://github.com/contentstack/live-preview-sdk/commit/c0bffefd3a100a96117b080bd5cd7d2f6302deea))
+- Updated codeowners (Aravind Kumar - [b759727](https://github.com/contentstack/live-preview-sdk/commit/b759727225ca20ee5e4b5addb8783a87eb8bc385))
+- codeql-analysis.yml (Aravind Kumar - [d90af9f](https://github.com/contentstack/live-preview-sdk/commit/d90af9f61ed6fca7f4fdfac6ad6993006ed771ea))
+- issues-jira.yml (Aravind Kumar - [21f6c9f](https://github.com/contentstack/live-preview-sdk/commit/21f6c9f8cf7a285480ff1733d0dae249546a86ef))
+- policy-scan.yml (Aravind Kumar - [0dcde50](https://github.com/contentstack/live-preview-sdk/commit/0dcde504de46d092b25698a04431be8564bb4299))
+- Updated codeowners (Aravind Kumar - [7e157dd](https://github.com/contentstack/live-preview-sdk/commit/7e157dd952279e6b7c08065606955e63611ee92c))
+- codeql-analysis.yml (Aravind Kumar - [3d77444](https://github.com/contentstack/live-preview-sdk/commit/3d77444de68d183e6002e8af5bbe0596cc5bf7e8))
+- sca-scan.yml (Aravind Kumar - [a30be29](https://github.com/contentstack/live-preview-sdk/commit/a30be298eb84326c8def8500e91744bd531234db))
 
 ## [v3.2.0](https://github.com/contentstack/live-preview-sdk/compare/v3.1.3...v3.2.0)
 
-> 8 April 2025
+> 11 April 2025
 
 ### New Features
 
-- feat(collab): add ui-components and collab feature handling (MohammedZuhairAhmed - [a809562](https://github.com/contentstack/live-preview-sdk/commit/a8095628d05e37f043ac06a4951c649a80255d60))
-- feat(collab): open popup from rhs panel (MohammedZuhairAhmed - [650da76](https://github.com/contentstack/live-preview-sdk/commit/650da761a01bfe319390fcff2d2254999f1a7e1c))
-- feat(collab): add env based tree-shaking (MohammedZuhairAhmed - [2f2ca5c](https://github.com/contentstack/live-preview-sdk/commit/2f2ca5c01a68487a47afce4f8f5e6a6ebecd4f57))
-- feat(collab): add retry mechanism for thread rendering (MohammedZuhairAhmed - [aa7a070](https://github.com/contentstack/live-preview-sdk/commit/aa7a0706679f5004f0d4ec313a3244622e7dda80))
-- feat(collab): pause collab mode in preview share (MohammedZuhairAhmed - [90957e2](https://github.com/contentstack/live-preview-sdk/commit/90957e248b401c233bf4dcdaf44bf21e562122fe))
-- feat(collab): delete thread when no comments present (Pratyush Biswas - [13ca6b0](https://github.com/contentstack/live-preview-sdk/commit/13ca6b0b052bde80519eefb908d348c85d48ac5a))
-- feat: updates (Ashish Debnath - [c9f59cf](https://github.com/contentstack/live-preview-sdk/commit/c9f59cfbcfb42753c4c325dbaddb4958c852bab0))
+- feat(collab): add ui-components and collab feature handling (MohammedZuhairAhmed - [8d15af3](https://github.com/contentstack/live-preview-sdk/commit/8d15af302c1129cfeee6acf39e99c282ed275f00))
+- feat(collab): open popup from rhs panel (MohammedZuhairAhmed - [5b09971](https://github.com/contentstack/live-preview-sdk/commit/5b099718bf34d8991d834e81e9eed13b06a6f840))
+- feat(collab): add env based tree-shaking (MohammedZuhairAhmed - [b4ef4a5](https://github.com/contentstack/live-preview-sdk/commit/b4ef4a5fe31d77f6743be2046ac10ecd936da6c2))
+- feat(collab): add retry mechanism for thread rendering (MohammedZuhairAhmed - [65e05c5](https://github.com/contentstack/live-preview-sdk/commit/65e05c5094e17d8b291acdfe03d86ccbda92a6d5))
+- feat(collab): pause collab mode in preview share (MohammedZuhairAhmed - [4f2856f](https://github.com/contentstack/live-preview-sdk/commit/4f2856f3d7acb28c2b08434ddb0a341b78db996d))
+- feat(collab): delete thread when no comments present (Pratyush Biswas - [5f8c184](https://github.com/contentstack/live-preview-sdk/commit/5f8c184ab26044bd07a2e220a2f97ddf5d0e85b7))
+- feat: updates (Ashish Debnath - [e9d11d6](https://github.com/contentstack/live-preview-sdk/commit/e9d11d631ba108f2dac69a48f902c3522e4f0995))
 
 ### Fixes
 
-- fix(collab): addressed PR comments (MohammedZuhairAhmed - [40cc68f](https://github.com/contentstack/live-preview-sdk/commit/40cc68fbd1414a02070eb688bdcbaac7fbaa9c4c))
-- fix(collab): stop event propagation of modals in collab mode and bug fixes (MohammedZuhairAhmed - [872dca6](https://github.com/contentstack/live-preview-sdk/commit/872dca601199baa89fa13cc2e35653cf34942d63))
-- fix(collab): disable buttons and icons until api processing is completed, add asyncloader component (MohammedZuhairAhmed - [1ea4b7d](https://github.com/contentstack/live-preview-sdk/commit/1ea4b7dc4fae41ae2085bb2c40fbb06f24c8f017))
-- fix(collab): bug fixes and code optimisations (MohammedZuhairAhmed - [5e3ba00](https://github.com/contentstack/live-preview-sdk/commit/5e3ba004ad8cefcfdf9b04c84561ac8eaf4e6061))
-- fix(collab): addressed pr comments (MohammedZuhairAhmed - [fd4510e](https://github.com/contentstack/live-preview-sdk/commit/fd4510e6037afb62dd8fc51298e81bef9519b47a))
-- fix(collab): re-design of indicator and api changes (MohammedZuhairAhmed - [11be7a5](https://github.com/contentstack/live-preview-sdk/commit/11be7a5d499e9f909dd20a88b4d166a31a92ddbd))
-- fix(collab): user tagging enhancements (diwakarmk7 - [a9837be](https://github.com/contentstack/live-preview-sdk/commit/a9837bec98fadcfbb76cef25f596b1c33b8cda18))
-- fix: add check for list overflow (Pratyush Biswas - [38b94d0](https://github.com/contentstack/live-preview-sdk/commit/38b94d0ef18d679008efb0c1c63aace73f941a4c))
-- fix(collab): highlight comment icon fix and code optimization (MohammedZuhairAhmed - [5cb072d](https://github.com/contentstack/live-preview-sdk/commit/5cb072d9e9d7f822f6a458df861b69511215cb24))
-- fix(collab): user tagging fix (MohammedZuhairAhmed - [5e4fd74](https://github.com/contentstack/live-preview-sdk/commit/5e4fd74138d275413ad2d5e30fc99cf421ab5783))
-- fix: threead position changes (Ashish Debnath - [d643ead](https://github.com/contentstack/live-preview-sdk/commit/d643eada1c4775cc803e46f2a29a2319b9cdba84))
-- fix(collab): added listener for new threads updated from state and bug fixes (MohammedZuhairAhmed - [b69d6fe](https://github.com/contentstack/live-preview-sdk/commit/b69d6fea727e40d1d2af04b528f6f01b152a6535))
-- fix(collab): made the inviteMetada to be updated when refreshed to get new comments (MohammedZuhairAhmed - [3b62098](https://github.com/contentstack/live-preview-sdk/commit/3b62098e7251691274dcb9689d82d42acad87bd7))
-- fix(chore): add validations in textarea (Pratyush Biswas - [4752c79](https://github.com/contentstack/live-preview-sdk/commit/4752c79b8da07a6e2107eff6bcf7e156cdf11039))
-- fix(collab): fix bugs (MohammedZuhairAhmed - [64e514d](https://github.com/contentstack/live-preview-sdk/commit/64e514d2f4ce04af0fccca1d3e8d4024660c8798))
-- fix: updates (Ashish Debnath - [13f2467](https://github.com/contentstack/live-preview-sdk/commit/13f24676c2264066d1dfa09001a6165f3a210ef7))
-- fix(collab): address pr reviews (MohammedZuhairAhmed - [9b6857d](https://github.com/contentstack/live-preview-sdk/commit/9b6857d2e973c1ec8799b78eef1a96be1a268e6e))
-- fix: test cae (Ashish Debnath - [539f012](https://github.com/contentstack/live-preview-sdk/commit/539f012e204239dd0fcf498503f4aec7bd6c7b74))
-- fix(collab): remove unused styles (Pratyush Biswas - [fceb9f6](https://github.com/contentstack/live-preview-sdk/commit/fceb9f6aacdb6ddf227a1ba17fa30b32e9c2c5b4))
-- fix(collab): fix cursor when hovering on popup (Pratyush Biswas - [12ae69d](https://github.com/contentstack/live-preview-sdk/commit/12ae69db23dd082d98410aa7c3b9fe1d478521ce))
-- fix: updates (Ashish Debnath - [b3ce7b5](https://github.com/contentstack/live-preview-sdk/commit/b3ce7b58d0632433a1ae4543d795e6d016213719))
-- fix(collab): remove debugging elements (Pratyush Biswas - [a07621e](https://github.com/contentstack/live-preview-sdk/commit/a07621eb1e10912f4e86637bdbe3ae24639390e1))
+- fix(collab): addressed PR comments (MohammedZuhairAhmed - [c02bb41](https://github.com/contentstack/live-preview-sdk/commit/c02bb41f061370b265721039038cd9b81b5bd221))
+- fix(collab): stop event propagation of modals in collab mode and bug fixes (MohammedZuhairAhmed - [6478284](https://github.com/contentstack/live-preview-sdk/commit/647828494eb8710f8dbac11f5b2c7a4c92e39dcb))
+- fix(collab): disable buttons and icons until api processing is completed, add asyncloader component (MohammedZuhairAhmed - [5626808](https://github.com/contentstack/live-preview-sdk/commit/56268087292f3a25102556568fdb469b3aeec635))
+- fix(collab): bug fixes and code optimisations (MohammedZuhairAhmed - [d890bcb](https://github.com/contentstack/live-preview-sdk/commit/d890bcb2cca9f8e6414a8a52f41a010027733bda))
+- fix(collab): addressed pr comments (MohammedZuhairAhmed - [cab71f0](https://github.com/contentstack/live-preview-sdk/commit/cab71f0b9918d5cf9ceff2983eac4952e5d95a0e))
+- fix(collab): re-design of indicator and api changes (MohammedZuhairAhmed - [5ccde4d](https://github.com/contentstack/live-preview-sdk/commit/5ccde4db516df3c02bdf8533db85d140ec5e795c))
+- fix(collab): user tagging enhancements (diwakarmk7 - [a7af4f4](https://github.com/contentstack/live-preview-sdk/commit/a7af4f41774a11a72b085fc0891654e27576fca1))
+- fix: add check for list overflow (Pratyush Biswas - [76a637c](https://github.com/contentstack/live-preview-sdk/commit/76a637c0637756ac0269e30ae1dd2f24518e1c4b))
+- fix(collab): highlight comment icon fix and code optimization (MohammedZuhairAhmed - [27c7fb0](https://github.com/contentstack/live-preview-sdk/commit/27c7fb06f24241244adb1107a3f62f237f021d0e))
+- fix: update field event is not sent when input event does not occur in inline editable fields (Faraaz Biyabani - [8399182](https://github.com/contentstack/live-preview-sdk/commit/83991825685975c49c48ef4e4c179fcc3af70d97))
+- fix(collab): user tagging fix (MohammedZuhairAhmed - [7e23fe5](https://github.com/contentstack/live-preview-sdk/commit/7e23fe5a058a0a7a1ecdfe2c2d9011b8c556f5c9))
+- fix: threead position changes (Ashish Debnath - [88a222a](https://github.com/contentstack/live-preview-sdk/commit/88a222a804828920b6852a6b1447ac0074dd791b))
+- fix(collab): added listener for new threads updated from state and bug fixes (MohammedZuhairAhmed - [274c0b1](https://github.com/contentstack/live-preview-sdk/commit/274c0b1b92da09301663abe6073983c7d1375a08))
+- fix(collab): made the inviteMetada to be updated when refreshed to get new comments (MohammedZuhairAhmed - [6e99bb5](https://github.com/contentstack/live-preview-sdk/commit/6e99bb55584266f1cab43c4b18abd1c8b802e38d))
+- fix(chore): add validations in textarea (Pratyush Biswas - [9780930](https://github.com/contentstack/live-preview-sdk/commit/9780930511c743604b3e6f5fe8b905c2c1e1c0ae))
+- fix(collab): fix bugs (MohammedZuhairAhmed - [94a26a0](https://github.com/contentstack/live-preview-sdk/commit/94a26a03e6ecb28256e3cf8b2fa9868dd17684f2))
+- fix: updates (Ashish Debnath - [837fa4d](https://github.com/contentstack/live-preview-sdk/commit/837fa4d232ab8090c1d3afda9a792d5fcae39d2b))
+- fix(collab): address pr reviews (MohammedZuhairAhmed - [9d5c6bb](https://github.com/contentstack/live-preview-sdk/commit/9d5c6bb01820d9191fe558afeae205192d436477))
+- fix: test cae (Ashish Debnath - [2af5eb8](https://github.com/contentstack/live-preview-sdk/commit/2af5eb8633d19b05a0a9fdc8acfa90f51cfdc256))
+- fix(collab): remove unused styles (Pratyush Biswas - [430023f](https://github.com/contentstack/live-preview-sdk/commit/430023f55690bd656829c83a368bd910abdd7244))
+- fix(collab): fix cursor when hovering on popup (Pratyush Biswas - [a0855f0](https://github.com/contentstack/live-preview-sdk/commit/a0855f0f88a53f11db7a3509c41566b03e6b3480))
+- fix: updates (Ashish Debnath - [fb5d8f1](https://github.com/contentstack/live-preview-sdk/commit/fb5d8f1d978381db9f3686b516e12433fe4fde85))
+- fix(collab): remove debugging elements (Pratyush Biswas - [d86c371](https://github.com/contentstack/live-preview-sdk/commit/d86c371d8e83185e5db9d816c122b494fbb34546))
 
 ### Chores And Housekeeping
 
-- chore(collab): addressed pr comments (MohammedZuhairAhmed - [81fe810](https://github.com/contentstack/live-preview-sdk/commit/81fe810a55f2f319c922c561b714fd8142b18041))
-- chore(collab): fix email styles (Pratyush Biswas - [8d5f64b](https://github.com/contentstack/live-preview-sdk/commit/8d5f64b6f7b71cfa5f6ac19e00f709f385f6c067))
+- chore(collab): addressed pr comments (MohammedZuhairAhmed - [0a2e644](https://github.com/contentstack/live-preview-sdk/commit/0a2e6447ee9912136927aaab3b0d27eb717d10a1))
+- chore(collab): fix email styles (Pratyush Biswas - [ecfde0a](https://github.com/contentstack/live-preview-sdk/commit/ecfde0ae403807c7e36461e3777d0a720eb82ae1))
 
 ### Refactoring and Updates
 
-- refactor(collab): addressed pr comments (MohammedZuhairAhmed - [28ba8e0](https://github.com/contentstack/live-preview-sdk/commit/28ba8e02f343aa157076323fd8d81ae89b1f8196))
-- refactor(collab): code optimisation and bug fixes (MohammedZuhairAhmed - [145d06b](https://github.com/contentstack/live-preview-sdk/commit/145d06b7fb7566aa19d068964114ef24b0729ffa))
-- refactor(collab): addressed pr feedbacks (MohammedZuhairAhmed - [6bcf3fe](https://github.com/contentstack/live-preview-sdk/commit/6bcf3fe5f91f167cd028fe9213ab7107cec32260))
+- refactor(collab): addressed pr comments (MohammedZuhairAhmed - [b299441](https://github.com/contentstack/live-preview-sdk/commit/b2994415544797ca72a6327d5fa36e9c1230bb0f))
+- refactor(collab): code optimisation and bug fixes (MohammedZuhairAhmed - [7005ca9](https://github.com/contentstack/live-preview-sdk/commit/7005ca90d3d2eb5230cb10f2089018bf38746e34))
+- refactor(collab): addressed pr feedbacks (MohammedZuhairAhmed - [019b793](https://github.com/contentstack/live-preview-sdk/commit/019b793872fe24cae0f380bfd7f41c7da198806c))
 
 ### Changes to Test Assests
 
-- test(collab): test cases addition and config updates (MohammedZuhairAhmed - [303969d](https://github.com/contentstack/live-preview-sdk/commit/303969d2eb405bdbd4622b047fe7fe5dd954bbdc))
-- test(collab): add ui-components test cases (MohammedZuhairAhmed - [324f362](https://github.com/contentstack/live-preview-sdk/commit/324f3628ff319c99534493145fcf1c764d7059b8))
-- test(collab): fix failing test cases (Pratyush Biswas - [3633792](https://github.com/contentstack/live-preview-sdk/commit/3633792fc80416db62b17d46adb4fc45989ca92d))
-- test(collab): add test cases for deleting thread when no comments (Pratyush Biswas - [25e5c8d](https://github.com/contentstack/live-preview-sdk/commit/25e5c8d795f2ddc602ec352a02b23e6f1c29abd2))
-- test(collab): added test cases (MohammedZuhairAhmed - [72be15d](https://github.com/contentstack/live-preview-sdk/commit/72be15dae0f5398a3a50244d374a4b094763c974))
-- test(collab): add corresponding test cases (Pratyush Biswas - [6c0c179](https://github.com/contentstack/live-preview-sdk/commit/6c0c179b4276c3c9fe5d3376c1404a6d96a5121c))
+- test(collab): test cases addition and config updates (MohammedZuhairAhmed - [fd2ade5](https://github.com/contentstack/live-preview-sdk/commit/fd2ade5087bbacabdb70f88df84dcb30002bcdf5))
+- test(collab): add ui-components test cases (MohammedZuhairAhmed - [0d458ec](https://github.com/contentstack/live-preview-sdk/commit/0d458ec6b86a3048327e9e385d705be7257d7b95))
+- test(collab): fix failing test cases (Pratyush Biswas - [3763de9](https://github.com/contentstack/live-preview-sdk/commit/3763de9bc9e69d2206eaba650f32e9758a251121))
+- test(collab): add test cases for deleting thread when no comments (Pratyush Biswas - [7cce06f](https://github.com/contentstack/live-preview-sdk/commit/7cce06f1f884aa737ff33ae0d3d4e6e094b05093))
+- test(collab): added test cases (MohammedZuhairAhmed - [1fc17ac](https://github.com/contentstack/live-preview-sdk/commit/1fc17ac07ca9851994272e2541b38ee782df10d1))
+- test(collab): add corresponding test cases (Pratyush Biswas - [435c653](https://github.com/contentstack/live-preview-sdk/commit/435c653567e28e31437f46bb0d0cc3292e2e9e55))
+- test: update focusOverlayWrapper test (Faraaz Biyabani - [caf179e](https://github.com/contentstack/live-preview-sdk/commit/caf179eb6ae329de6993977fa93dcd3e74af206a))
 
 ### General Changes
 
-- tagging changes (diwakarmk7 - [048c721](https://github.com/contentstack/live-preview-sdk/commit/048c72188647d4a8bca2a76dce39e1d116d24e86))
-- tagging users (diwakarmk7 - [dc86309](https://github.com/contentstack/live-preview-sdk/commit/dc86309c6fd2985b710637494c61fa5914a8160c))
-- Fix thread popup styles (Pratyush Biswas - [6e8e2e3](https://github.com/contentstack/live-preview-sdk/commit/6e8e2e3bffff95f4dbe49513a9a3c4b72a147388))
-- suggestion scroll movement fix (diwakarmk7 - [1b29a3a](https://github.com/contentstack/live-preview-sdk/commit/1b29a3a96fe9db55e22f5a457133a043c5842e58))
-- disable button changes (diwakarmk7 - [bf8b65c](https://github.com/contentstack/live-preview-sdk/commit/bf8b65c83b79d596feffdad921bbaad71562ad60))
-- added disabled state for adding comment button (diwakarmk7 - [1b632f0](https://github.com/contentstack/live-preview-sdk/commit/1b632f0a1b8ca2749bdcc5d7580134d9853b7b4f))
-- tagging changes (diwakarmk7 - [d904b39](https://github.com/contentstack/live-preview-sdk/commit/d904b394cfc5ff439261e5ed971cfe07b1cf07e7))
-- remove unused styles (Pratyush Biswas - [1008bb3](https://github.com/contentstack/live-preview-sdk/commit/1008bb37e7d092461dea117e2e8c232fe21d1062))
-- Fix resolve button style (Pratyush Biswas - [e470913](https://github.com/contentstack/live-preview-sdk/commit/e470913cd67d45b7c3a8e8b9be8b165c9886b298))
-- added id to tousers list (diwakarmk7 - [4410571](https://github.com/contentstack/live-preview-sdk/commit/44105712ff3f971bc7ac70c5dfca25c1c188db5f))
+- tagging changes (diwakarmk7 - [001f419](https://github.com/contentstack/live-preview-sdk/commit/001f419ce4cfb261ee87a727ff8150d036771358))
+- tagging users (diwakarmk7 - [f0e0d81](https://github.com/contentstack/live-preview-sdk/commit/f0e0d8102482db26e577ae5943862e3bc7887407))
+- Revert "fix: update field event is not sent when input event does not occur in inline editable fields" (Faraaz Biyabani - [c5c3827](https://github.com/contentstack/live-preview-sdk/commit/c5c3827ba9404892560e1e57444c702fd97936df))
+- Fix thread popup styles (Pratyush Biswas - [b0085ac](https://github.com/contentstack/live-preview-sdk/commit/b0085acd25dbc342bb222dc9bf6d8d13a68357af))
+- suggestion scroll movement fix (diwakarmk7 - [1584b62](https://github.com/contentstack/live-preview-sdk/commit/1584b62e0b52342cc355de645ae82945f76dc875))
+- disable button changes (diwakarmk7 - [07cb9f5](https://github.com/contentstack/live-preview-sdk/commit/07cb9f57d0ad3003054ff1f82d407c39e52c84dd))
+- added disabled state for adding comment button (diwakarmk7 - [b5c90a5](https://github.com/contentstack/live-preview-sdk/commit/b5c90a5f4040918eaec405c257e99c10f893b626))
+- tagging changes (diwakarmk7 - [598286f](https://github.com/contentstack/live-preview-sdk/commit/598286f6685695aca9e0206c18c14e76f81c8b03))
+- remove unused styles (Pratyush Biswas - [1db60c4](https://github.com/contentstack/live-preview-sdk/commit/1db60c49ae5f2decd6ec57a825d8d55206171096))
+- Fix resolve button style (Pratyush Biswas - [e0ecaaa](https://github.com/contentstack/live-preview-sdk/commit/e0ecaaaa0fbf04b1bc61736541302cb0d62e8a9b))
+- added id to tousers list (diwakarmk7 - [df62756](https://github.com/contentstack/live-preview-sdk/commit/df6275625518c222909b8039eb55d21ca38df7aa))
 
 ## [v3.1.3](https://github.com/contentstack/live-preview-sdk/compare/v3.1.2...v3.1.3)
 
diff --git a/README.md b/README.md
index 79393218..80dba4e0 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ npm install @contentstack/live-preview-utils
 Alternatively, if you want to include the package directly in your website HTML code, use the following command:
 
 ```html
-<script type='module'  integrity='sha384-Q1kNLAr9TbfZ9lsUUXH&#x2F;vW79LERzfbYJc7aLNSYjKFLzBZQDp&#x2F;Jk09+ADHo9mhEq' crossorigin="anonymous">
-     import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.0';
+<script type='module'  integrity='sha384-A8av+t5rI9uSevzozgzaoIRdBTs5pn1tt7F&#x2F;ekJQ7NAE1l3RenCKeJeMUTdrbtcM' crossorigin="anonymous">
+     import ContentstackLivePreview from 'https://esm.sh/@contentstack/live-preview-utils@3.2.1';
 
      ContentstackLivePreview.init({
         stackDetails: {
diff --git a/package-lock.json b/package-lock.json
index e3628b7a..56df4eef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@contentstack/live-preview-utils",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@contentstack/live-preview-utils",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "license": "MIT",
             "dependencies": {
                 "@preact/compat": "17.1.2",
diff --git a/package.json b/package.json
index 1b672b4a..5eb1058b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@contentstack/live-preview-utils",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "description": "Contentstack provides the Live Preview SDK to establish a communication channel between the various Contentstack SDKs and your website, transmitting  live changes to the preview pane.",
     "type": "module",
     "types": "dist/legacy/index.d.ts",
diff --git a/src/index.ts b/src/index.ts
index d7226788..36b903f5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -71,7 +71,9 @@ class LightLivePreviewHoC {
 }
 
 const ContentstackLivePreview =
-    process.env.PURGE_PREVIEW_SDK || process.env.REACT_APP_PURGE_PREVIEW_SDK
+    typeof process !== "undefined" &&
+    (process?.env?.PURGE_PREVIEW_SDK === "true" ||
+        process?.env?.REACT_APP_PURGE_PREVIEW_SDK === "true")
         ? LightLivePreviewHoC
         : ContentstackLivePreviewHOC;
 
diff --git a/src/logger/logger.ts b/src/logger/logger.ts
index 66f810c2..fad32d8b 100644
--- a/src/logger/logger.ts
+++ b/src/logger/logger.ts
@@ -8,7 +8,10 @@ export class PublicLogger {
             | Console["info"],
         message: any[]
     ): void {
-        if (process?.env?.NODE_ENV !== "test") {
+        if (
+            typeof process !== "undefined" &&
+            process?.env?.NODE_ENV !== "test"
+        ) {
             logCallback("Live_Preview_SDK:", ...message);
         }
     }
diff --git a/src/visualBuilder/__test__/index.test.ts b/src/visualBuilder/__test__/index.test.ts
index 32d937df..4eba7789 100644
--- a/src/visualBuilder/__test__/index.test.ts
+++ b/src/visualBuilder/__test__/index.test.ts
@@ -35,6 +35,7 @@ vi.mock("../utils/visualBuilderPostMessage", async () => {
 Object.defineProperty(globalThis, "crypto", {
     value: {
         getRandomValues: (arr: Array<any>) => crypto.randomBytes(arr.length),
+        randomUUID: () => crypto.randomUUID()
     },
 });
 // Increase the timeout for the test
diff --git a/src/visualBuilder/index.ts b/src/visualBuilder/index.ts
index 9c8faa2c..b44be772 100644
--- a/src/visualBuilder/index.ts
+++ b/src/visualBuilder/index.ts
@@ -296,6 +296,7 @@ export class VisualBuilder {
         if (!config.enable || config.mode < ILivePreviewModeConfig.BUILDER) {
             return;
         }
+
         visualBuilderPostMessage
             ?.send<IVisualBuilderInitEvent>("init", {
                 isSSR: config.ssr,
diff --git a/src/visualBuilder/listeners/mouseClick.ts b/src/visualBuilder/listeners/mouseClick.ts
index 15be9515..36419372 100644
--- a/src/visualBuilder/listeners/mouseClick.ts
+++ b/src/visualBuilder/listeners/mouseClick.ts
@@ -29,6 +29,7 @@ import { generateThread } from "../generators/generateThread";
 import { isCollabThread } from "../generators/generateThread";
 import { toggleCollabPopup } from "../generators/generateThread";
 import { fixSvgXPath } from "../utils/collabUtils";
+import { v4 as uuidV4 } from "uuid";
 
 type HandleBuilderInteractionParams = Omit<
     EventListenerHandlerParams,
@@ -79,6 +80,22 @@ async function handleBuilderInteraction(
         (eventTarget.hasAttribute("data-cslp") ||
             eventTarget.closest("[data-cslp]"));
 
+    // if multiple elements with the same cslp element are found,
+    // assign a unique ID to each element which we can use to identify
+    // them in updateFocussedState and other places where we
+    // would have queried the element by data-cslp
+    const duplicates = document.querySelectorAll(
+        `[data-cslp="${eventTarget?.getAttribute("data-cslp")}"]`
+    );
+    if (duplicates.length > 1) {
+        duplicates.forEach((ele) => {
+            if (!ele.hasAttribute("data-cslp-unique-id")) {
+                const uniqueId = `cslp-${uuidV4()}`;
+                ele.setAttribute("data-cslp-unique-id", uniqueId);
+            }
+        });
+    }
+
     // if the target element is a studio-ui element, return
     // this is currently used for the "Edit in Studio" button
     if (eventTarget?.getAttribute("data-studio-ui") === "true") {
diff --git a/src/visualBuilder/utils/__test__/handleFieldMouseDown.test.ts b/src/visualBuilder/utils/__test__/handleFieldMouseDown.test.ts
index f0cc626f..22a50668 100644
--- a/src/visualBuilder/utils/__test__/handleFieldMouseDown.test.ts
+++ b/src/visualBuilder/utils/__test__/handleFieldMouseDown.test.ts
@@ -128,26 +128,36 @@ describe("handle numeric field key down", () => {
 });
 
 describe("handle keydown in button contenteditable", () => {
-    let button: HTMLButtonElement | undefined;
-    let spiedPreventDefault: MockInstance<(e: []) => void> | undefined;
-    let spiedInsertSpaceAtCursor:
-        | MockInstance<(typeof insertSpaceAtCursor)["insertSpaceAtCursor"]>
-        | undefined;
+    let spiedSendFieldEvent: MockInstance<() => void> | undefined;
+
+    beforeEach(() => {
+        spiedSendFieldEvent = vi
+            .spyOn(generateOverlay, "sendFieldEvent")
+            .mockImplementation(() => {});
+        const visualBuilderContainer = document.createElement("div");
+        visualBuilderContainer.classList.add("visual-builder__container");
+        document.body.appendChild(visualBuilderContainer);
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
 
     test("should insert space in button content-editable", () => {
+        let spiedPreventDefault: MockInstance<(e: []) => void> | undefined;
         vi.spyOn(window, "getSelection").mockReturnValue({
-            // @ts-ignore
+            // @ts-expect-error mocking only required properties
             getRangeAt: (n: number) => ({
                 startOffset: 0,
                 endOffset: 0,
             }),
         });
-        spiedInsertSpaceAtCursor = vi.spyOn(
+        const spiedInsertSpaceAtCursor = vi.spyOn(
             insertSpaceAtCursor,
             "insertSpaceAtCursor"
         );
 
-        button = document.createElement("button");
+        const button = document.createElement("button");
         button.innerHTML = "Test";
         button.setAttribute("contenteditable", "true");
         button.setAttribute(
@@ -169,6 +179,47 @@ describe("handle keydown in button contenteditable", () => {
 
         expect(spiedPreventDefault).toHaveBeenCalledTimes(1);
         expect(spiedInsertSpaceAtCursor).toHaveBeenCalledWith(button);
+        expect(spiedSendFieldEvent).toHaveBeenCalled();
+    });
+
+    test("should insert space in span content-editable inside button", () => {
+        let spiedPreventDefault: MockInstance<(e: []) => void> | undefined;
+        vi.spyOn(window, "getSelection").mockReturnValue({
+            // @ts-expect-error mocking only required properties
+            getRangeAt: (n: number) => ({
+                startOffset: 0,
+                endOffset: 0,
+            }),
+        });
+        const spiedInsertSpaceAtCursor = vi.spyOn(
+            insertSpaceAtCursor,
+            "insertSpaceAtCursor"
+        );
+
+        const button = document.createElement("button");
+        const span = document.createElement("span");
+        button.appendChild(span);
+        span.setAttribute("contenteditable", "true");
+        span.setAttribute(
+            VISUAL_BUILDER_FIELD_TYPE_ATTRIBUTE_KEY,
+            "single_line"
+        );
+
+        span.addEventListener("keydown", (e) => {
+            spiedPreventDefault = vi.spyOn(e, "preventDefault");
+            handleFieldKeyDown(e);
+        });
+
+        const keyDownEvent = new KeyboardEvent("keydown", {
+            bubbles: true,
+            key: "Space",
+            code: "Space",
+        });
+        span.dispatchEvent(keyDownEvent);
+
+        expect(spiedPreventDefault).toHaveBeenCalledTimes(1);
+        expect(spiedInsertSpaceAtCursor).toHaveBeenCalledWith(span);
+        expect(spiedSendFieldEvent).toHaveBeenCalled();
     });
 });
 
diff --git a/src/visualBuilder/utils/collabUtils.ts b/src/visualBuilder/utils/collabUtils.ts
index a3e5147a..1664dd06 100644
--- a/src/visualBuilder/utils/collabUtils.ts
+++ b/src/visualBuilder/utils/collabUtils.ts
@@ -90,13 +90,17 @@ export const getMessageWithDisplayName = (
 
     let tempText = sanitizeData(comment.message).replace(/<[^>]*>/g, "");
 
-    comment?.toUsers?.forEach((user) => {
+    comment.toUsers?.forEach((user) => {
         const userPattern = new RegExp(`{{${user}}}`, "g");
         const userData = userState.userMap[user];
+        const displayName = userData
+            ? userData.display || getUserName(userData)
+            : `unknown user`;
+
         const replacement =
             profile === "html"
-                ? `<b class="collab-thread-comment--message">@${userData.display || getUserName(userData)}</b>`
-                : `@${userData.display || getUserName(userData)}`;
+                ? `<b class="collab-thread-comment--message">@${displayName}</b>`
+                : `@${displayName}`;
         tempText = tempText.replace(userPattern, replacement);
     });
 
diff --git a/src/visualBuilder/utils/handleFieldMouseDown.ts b/src/visualBuilder/utils/handleFieldMouseDown.ts
index 8ead2998..5ed62e3a 100644
--- a/src/visualBuilder/utils/handleFieldMouseDown.ts
+++ b/src/visualBuilder/utils/handleFieldMouseDown.ts
@@ -44,7 +44,15 @@ export function handleFieldKeyDown(e: Event): void {
         VISUAL_BUILDER_FIELD_TYPE_ATTRIBUTE_KEY
     ) as FieldDataType | null;
 
-    if (targetElement.tagName === "BUTTON") {
+    if (
+        event
+            .composedPath()
+            .some(
+                (element) =>
+                    element instanceof Element && element.tagName === "BUTTON"
+            )
+    ) {
+        // custom space handling when a button is involved
         handleKeyDownOnButton(event);
     }
     if (fieldType === FieldDataType.NUMBER) {
@@ -56,11 +64,12 @@ export function handleFieldKeyDown(e: Event): void {
 
 // spaces do not work inside a button content-editable
 // this adds a space and moves the cursor ahead, the
-// button press event is also prevented
+// button press event is also prevented, finally syncs the field
 function handleKeyDownOnButton(e: KeyboardEvent) {
     if (e.code === "Space" && e.target) {
         e.preventDefault();
         insertSpaceAtCursor(e.target as HTMLElement);
+        throttledFieldSync();
     }
 }
 
diff --git a/src/visualBuilder/utils/updateFocussedState.ts b/src/visualBuilder/utils/updateFocussedState.ts
index d9454df7..3d1a9d52 100644
--- a/src/visualBuilder/utils/updateFocussedState.ts
+++ b/src/visualBuilder/utils/updateFocussedState.ts
@@ -105,11 +105,16 @@ export function updateFocussedState({
         return;
     }
 
-    const previousSelectedElementCslp =
-        previousSelectedEditableDOM?.getAttribute("data-cslp");
-    const newPreviousSelectedElement = document.querySelector(
-        `[data-cslp="${previousSelectedElementCslp}"]`
-    );
+    // prefer data-cslp-unique-id when available else use data-cslp.
+    // unique ID is added on click when multiple elements with same
+    // data-cslp are found.
+    const previousSelectedElementCslp = editableElement?.getAttribute("data-cslp") || "";
+    const previousSelectedElementCslpUniqueId =
+        previousSelectedEditableDOM?.getAttribute("data-cslp-unique-id");
+    const newPreviousSelectedElement =
+        document.querySelector(
+            `[data-cslp-unique-id="${previousSelectedElementCslpUniqueId}"]`
+        ) || document.querySelector(`[data-cslp="${previousSelectedElementCslp}"]`);
     if (!newPreviousSelectedElement && resizeObserver) {
         hideFocusOverlay({
             visualBuilderOverlayWrapper: overlayWrapper,
@@ -148,8 +153,7 @@ export function updateFocussedState({
         psuedoEditableElement.style.visibility = "visible";
     }
 
-    const cslp = editableElement?.getAttribute("data-cslp") || "";
-    const fieldMetadata = extractDetailsFromCslp(cslp);
+    const fieldMetadata = extractDetailsFromCslp(previousSelectedElementCslp);
 
     const targetElementDimension = editableElement.getBoundingClientRect();
     if (targetElementDimension.width && targetElementDimension.height) {
@@ -228,9 +232,13 @@ export function updateFocussedStateOnMutation(
     if (!selectedElement) return;
 
     const selectedElementCslp = selectedElement?.getAttribute("data-cslp");
-    const newSelectedElement = document.querySelector(
-        `[data-cslp="${selectedElementCslp}"]`
+    const selectedElementCslpUniqueId = selectedElement?.getAttribute(
+        "data-cslp-unique-id"
     );
+    const newSelectedElement =
+        document.querySelector(
+            `[data-cslp-unique-id="${selectedElementCslpUniqueId}"]`
+        ) || document.querySelector(`[data-cslp="${selectedElementCslp}"]`);
     if (!newSelectedElement && resizeObserver) {
         hideFocusOverlay({
             visualBuilderOverlayWrapper: focusOverlayWrapper,