Bump postcss and css-loader

Bumps [postcss](https://github.com/postcss/postcss) to 8.4.31 and updates ancestor dependencies [postcss](https://github.com/postcss/postcss) and [css-loader](https://github.com/webpack-contrib/css-loader). These dependencies need to be updated together. Updates `postcss` from 7.0.35 to 8.4.31 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.35...8.4.31) Updates `postcss` from 8.2.10 to 8.4.31 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.35...8.4.31) Updates `css-loader` from 1.0.0 to 6.8.1 - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v6.8.1) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect - dependency-name: postcss dependency-type: indirect - dependency-name: css-loader dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
2025-12-23 10:51:30 +00:00 · 2023-10-04 00:49:24 +00:00
97 changed files with 2772 additions and 4081 deletions
--- a/images/CopilotCommand.svg
+++ b/images/CopilotCommand.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3626 11.9771C13.1573 11.9837 13.019 12.0288 12.9215 12.0836C12.817 12.1424 12.7301 12.229 12.6508 12.3542C12.4802 12.6239 12.3837 12.9957 12.252 13.5033L12.2347 13.5699C12.1079 14.0581 11.9424 14.6764 11.5775 15.1594C11.1788 15.687 10.5903 16 9.74835 16H4.63681C3.55423 16 2.75741 15.2435 2.18373 14.3271C1.60629 13.4047 1.17786 12.2045 0.845481 11.0542L0.845003 11.0525C0.464365 9.73512 -0.017355 8.06787 0.000479698 6.72244C0.00951195 6.04103 0.145994 5.34953 0.569528 4.825C1.00712 4.28305 1.66518 4.02294 2.50365 4.02294H2.63739C2.84267 4.01631 2.98102 3.97123 3.07848 3.9164C3.18305 3.85757 3.26995 3.77102 3.34916 3.64584C3.51985 3.37613 3.61631 3.00432 3.74801 2.49671L3.76529 2.43012C3.89213 1.94191 4.05757 1.32365 4.42251 0.840633C4.82119 0.312966 5.40972 0 6.25165 0H11.3632C12.4458 0 13.2426 0.756543 13.8163 1.67295C14.3937 2.59534 14.8221 3.79546 15.1545 4.94582L15.155 4.94748C15.5356 6.26488 16.0174 7.93213 15.9995 9.27756C15.9905 9.95897 15.854 10.6505 15.4305 11.175C14.9929 11.717 14.3348 11.9771 13.4963 11.9771H13.3626ZM14.1354 5.28381C13.8114 4.16251 13.4194 3.09096 12.9303 2.3096C12.4374 1.52225 11.9215 1.14296 11.3632 1.14296H7.95613C8.10274 1.42082 8.22537 1.731 8.33548 2.05199C8.48008 2.47355 8.61427 2.94842 8.75233 3.43699L8.78302 3.54557C9.32758 5.47082 10.008 7.94794 10.4498 9.5646C10.6507 10.2998 11.2693 10.8098 11.9798 10.8333H13.4156C13.4253 10.8333 13.4351 10.8335 13.4447 10.8341H13.4963C14.1298 10.8341 14.4484 10.6443 14.6237 10.4272C14.813 10.1928 14.9255 9.8162 14.9328 9.26133C14.9477 8.13479 14.5323 6.65749 14.1354 5.28381ZM3.06972 13.6904C3.56261 14.4777 4.0785 14.857 4.63681 14.857H8.04387C7.89726 14.5792 7.77463 14.269 7.66452 13.948C7.51992 13.5265 7.38573 13.0516 7.24767 12.563L7.21698 12.4544C6.67242 10.5292 5.99197 8.05206 5.55019 6.4354C5.34929 5.70024 4.73069 5.19015 4.02018 5.16674H2.58445C2.57465 5.16674 2.56492 5.16646 2.55526 5.1659H2.50365C1.87025 5.1659 1.5516 5.35572 1.37634 5.57277C1.18703 5.80723 1.07454 6.1838 1.06719 6.73867C1.05225 7.86521 1.46769 9.34251 1.86459 10.7162C2.18857 11.8375 2.58057 12.909 3.06972 13.6904ZM9.10298 10.8333H9.87304C9.67506 10.5554 9.5217 10.236 9.42598 9.88575C9.233 9.17956 8.99466 8.30985 8.74215 7.39421L8.47331 6.42622C8.26579 5.67902 7.62465 5.16674 6.89702 5.16674H6.12695C6.32494 5.44463 6.4783 5.76395 6.57402 6.11425C6.767 6.82044 7.00534 7.69015 7.25785 8.60579L7.52669 9.57378C7.73421 10.321 8.37535 10.8333 9.10298 10.8333ZM6.89702 4.02378C7.23212 4.02378 7.55609 4.08968 7.85646 4.21152C7.82459 4.0984 7.7931 3.98682 7.76205 3.87706L7.73417 3.77844C7.59304 3.27914 7.46754 2.83514 7.33414 2.44626C7.19129 2.02979 7.05211 1.71602 6.90214 1.4942C6.77014 1.29897 6.56087 1.14296 6.25165 1.14296C5.69009 1.14296 5.42306 1.33297 5.2517 1.55976C5.04661 1.83121 4.92755 2.21889 4.79304 2.73662C4.78284 2.77588 4.77249 2.81622 4.76191 2.85744C4.66966 3.21703 4.55997 3.64464 4.37733 4.02378H6.89702ZM9.10298 11.9762C8.76788 11.9762 8.44391 11.9103 8.14354 11.7885C8.1754 11.9016 8.2069 12.0132 8.23795 12.1229L8.26583 12.2216C8.40696 12.7208 8.53246 13.1649 8.66585 13.5537C8.80871 13.9702 8.94789 14.284 9.09786 14.5058C9.22986 14.701 9.43913 14.857 9.74835 14.857C10.3099 14.857 10.5769 14.667 10.7483 14.4402C10.9534 14.1688 11.0725 13.7811 11.207 13.2634C11.2172 13.2241 11.2275 13.1838 11.2381 13.1426C11.3303 12.783 11.44 12.3554 11.6227 11.9762H9.10298Z" fill="#0078D4"/>
-</svg>
--- a/images/QueryCopilotNewLogo.svg
+++ b/images/QueryCopilotNewLogo.svg
@@ -1,40 +1,34 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34px" height="34px" viewBox="0 0 34 34" version="1.1">
+<svg width="32" height="34" viewBox="0 0 32 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 0.739258L16 1.04436V9.68622L11.2 10.8013L9.60002 12.9967V16.4479C9.60002 18.7669 10.8545 20.9045 12.879 22.0353L17.4036 24.5626L9.6 28.69L6.35592 29.1523L3.27902 27.4337C1.25445 26.3028 0 24.1652 0 21.8462V11.7591C0 9.43952 1.25512 7.30147 3.28055 6.17085L12.3174 1.12639L12.3121 1.13012L13 0.739258Z" fill="url(#paint0_radial_857_143948)"/>
+<path d="M13 0.739258L16 1.04436V9.68622L11.2 10.8013L9.60002 12.9967V16.4479C9.60002 18.7669 10.8545 20.9045 12.879 22.0353L17.4036 24.5626L9.6 28.69L6.35592 29.1523L3.27902 27.4337C1.25445 26.3028 0 24.1652 0 21.8462V11.7591C0 9.43952 1.25512 7.30147 3.28055 6.17085L12.3174 1.12639L12.3121 1.13012L13 0.739258Z" fill="url(#paint1_linear_857_143948)"/>
+<path d="M22.399 12.001L30.399 16.801L31.999 18.401V21.8452C31.999 24.1642 30.7446 26.3018 28.72 27.4327L19.12 32.7949C17.1804 33.8784 14.8177 33.8784 12.878 32.7949L3.27804 27.4327C3.09146 27.3284 2.91141 27.2157 2.73828 27.095L3.278 27.3965C5.21762 28.4799 7.58035 28.4799 9.51996 27.3965L19.12 22.0342C21.1445 20.9033 22.399 18.7657 22.399 16.4467V12.001Z" fill="url(#paint2_radial_857_143948)"/>
+<path d="M22.399 12.001L30.399 16.801L31.999 18.401V21.8452C31.999 24.1642 30.7446 26.3018 28.72 27.4327L19.12 32.7949C17.1804 33.8784 14.8177 33.8784 12.878 32.7949L3.27804 27.4327C3.09146 27.3284 2.91141 27.2157 2.73828 27.095L3.278 27.3965C5.21762 28.4799 7.58035 28.4799 9.51996 27.3965L19.12 22.0342C21.1445 20.9033 22.399 18.7657 22.399 16.4467V12.001Z" fill="url(#paint3_linear_857_143948)"/>
+<path d="M28.7191 6.17053L19.119 0.811705C17.1802 -0.270568 14.819 -0.270568 12.8802 0.811704L12.3151 1.1271C10.6239 2.31737 9.59961 4.26472 9.59961 6.36025V13.0461L12.8802 11.2149C14.819 10.1326 17.1802 10.1326 19.119 11.2149L28.7191 16.5737C30.6984 17.6786 31.9421 19.7456 31.9977 22.0039C31.999 21.9514 31.9996 21.8987 31.9996 21.8459V11.7588C31.9996 9.4392 30.7445 7.30115 28.7191 6.17053Z" fill="url(#paint4_radial_857_143948)"/>
+<path d="M28.7191 6.17053L19.119 0.811705C17.1802 -0.270568 14.819 -0.270568 12.8802 0.811704L12.3151 1.1271C10.6239 2.31737 9.59961 4.26472 9.59961 6.36025V13.0461L12.8802 11.2149C14.819 10.1326 17.1802 10.1326 19.119 11.2149L28.7191 16.5737C30.6984 17.6786 31.9421 19.7456 31.9977 22.0039C31.999 21.9514 31.9996 21.8987 31.9996 21.8459V11.7588C31.9996 9.4392 30.7445 7.30115 28.7191 6.17053Z" fill="url(#paint5_linear_857_143948)"/>
 <defs>
-<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="0" cy="0" fx="0" fy="0" r="1" gradientTransform="matrix(-7.787324,-9.624098,9.028449,-7.305356,26.915817,14.703725)">
-<stop offset="0.0955758" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
-<stop offset="0.715277" style="stop-color:rgb(4.705882%,43.921569%,60.784314%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(3.921569%,31.372549%,47.45098%);stop-opacity:1;"/>
+<radialGradient id="paint0_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(13.5054 9.8837) rotate(112.544) scale(23.4519 19.3067)">
+<stop offset="0.206732" stop-color="#4995D0"/>
+<stop offset="0.875628" stop-color="#0078D4"/>
 </radialGradient>
-<radialGradient id="radial1" gradientUnits="userSpaceOnUse" cx="0" cy="0" fx="0" fy="0" r="1" gradientTransform="matrix(7.955722,8.152531,-8.011265,7.817866,7.897393,23.013892)">
-<stop offset="0" style="stop-color:rgb(0%,56.862745%,92.156863%);stop-opacity:1;"/>
-<stop offset="0.523516" style="stop-color:rgb(15.294118%,39.215686%,90.588235%);stop-opacity:1;"/>
-<stop offset="0.923392" style="stop-color:rgb(2.352941%,21.176471%,76.470588%);stop-opacity:1;"/>
-</radialGradient>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="5.16831" y1="2" x2="7.75605" y2="17.2359" gradientTransform="matrix(1.416667,0,0,1.416667,0,0)">
-<stop offset="0.289817" style="stop-color:rgb(0%,64.705882%,85.098039%);stop-opacity:1;"/>
-<stop offset="0.662336" style="stop-color:rgb(12.941176%,79.215686%,69.803922%);stop-opacity:1;"/>
-<stop offset="0.950002" style="stop-color:rgb(41.568627%,86.27451%,56.470588%);stop-opacity:1;"/>
+<linearGradient id="paint1_linear_857_143948" x1="11.0625" y1="26.6174" x2="9.78695" y2="24.2436" gradientUnits="userSpaceOnUse">
+<stop offset="0.9999" stop-color="#0078D4"/>
+<stop offset="1" stop-color="#0078D4" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="7.25046" y1="2" x2="7.87502" y2="16.4401" gradientTransform="matrix(1.416667,0,0,1.416667,0,0)">
-<stop offset="0" style="stop-color:rgb(6.27451%,78.823529%,92.54902%);stop-opacity:1;"/>
-<stop offset="0.166667" style="stop-color:rgb(0.392157%,68.235294%,89.411765%);stop-opacity:0;"/>
-</linearGradient>
-<radialGradient id="radial2" gradientUnits="userSpaceOnUse" cx="0" cy="0" fx="0" fy="0" r="1" gradientTransform="matrix(-9.930588,25.254205,-30.30117,-11.915182,29.269325,8.70791)">
-<stop offset="0.154405" style="stop-color:rgb(15.294118%,44.313725%,84.705882%);stop-opacity:1;"/>
-<stop offset="0.678875" style="stop-color:rgb(7.843137%,69.411765%,100%);stop-opacity:1;"/>
-<stop offset="0.931138" style="stop-color:rgb(8.627451%,74.901961%,87.45098%);stop-opacity:1;"/>
+<radialGradient id="paint2_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(6.899 24.5214) rotate(-3.9995) scale(24.6197 15.4594)">
+<stop offset="0.140029" stop-color="#80C8FF"/>
+<stop offset="0.952721" stop-color="#0078D4"/>
 </radialGradient>
-<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="21.2403" y1="7.01008" x2="20.306" y2="12.5802" gradientTransform="matrix(1.416667,0,0,1.416667,0,0)">
-<stop offset="0.0581535" style="stop-color:rgb(7.843137%,69.411765%,100%);stop-opacity:1;"/>
-<stop offset="0.708063" style="stop-color:rgb(16.078431%,46.27451%,85.882353%);stop-opacity:0;"/>
+<linearGradient id="paint3_linear_857_143948" x1="26.8932" y1="15.5508" x2="25.5491" y2="17.8921" gradientUnits="userSpaceOnUse">
+<stop offset="0.9999" stop-color="#3F8AC3"/>
+<stop offset="1" stop-color="#8C66BA" stop-opacity="0"/>
+</linearGradient>
+<radialGradient id="paint4_radial_857_143948" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(26.632 16.3878) rotate(-138.33) scale(22.8015 13.0047)">
+<stop stop-color="#7BC6FF"/>
+<stop offset="0.839255" stop-color="#0078D4"/>
+</radialGradient>
+<linearGradient id="paint5_linear_857_143948" x1="9.59961" y1="8.71337" x2="12.2131" y2="8.71337" gradientUnits="userSpaceOnUse">
+<stop offset="0.9999" stop-color="#0078D4"/>
+<stop offset="1" stop-color="#436DCD" stop-opacity="0"/>
 </linearGradient>
 </defs>
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial0);" d="M 24.1875 5.1875 C 23.777344 3.792969 22.496094 2.832031 21.039062 2.832031 L 20.078125 2.832031 C 18.496094 2.832031 17.140625 3.960938 16.855469 5.519531 L 15.175781 14.625 L 15.628906 13.066406 C 16.039062 11.664062 17.320312 10.703125 18.777344 10.703125 L 24.335938 10.703125 L 26.667969 11.613281 L 28.917969 10.703125 L 28.261719 10.703125 C 26.804688 10.703125 25.523438 9.746094 25.113281 8.347656 Z M 24.1875 5.1875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial1);" d="M 10.152344 28.796875 C 10.558594 30.199219 11.839844 31.167969 13.300781 31.167969 L 15.359375 31.167969 C 17.128906 31.167969 18.578125 29.765625 18.636719 27.996094 L 18.941406 19.011719 L 18.371094 20.945312 C 17.960938 22.339844 16.679688 23.296875 15.226562 23.296875 L 9.613281 23.296875 L 7.613281 22.210938 L 5.449219 23.296875 L 6.09375 23.296875 C 7.554688 23.296875 8.839844 24.261719 9.246094 25.664062 Z M 10.152344 28.796875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 20.898438 2.832031 L 9.535156 2.832031 C 6.289062 2.832031 4.339844 7.121094 3.042969 11.410156 C 1.503906 16.492188 -0.507812 23.289062 5.316406 23.289062 L 10.222656 23.289062 C 11.6875 23.289062 12.972656 22.320312 13.375 20.910156 C 14.230469 17.929688 15.722656 12.722656 16.898438 8.761719 C 17.496094 6.75 17.992188 5.019531 18.753906 3.941406 C 19.183594 3.339844 19.894531 2.832031 20.898438 2.832031 Z M 20.898438 2.832031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 20.898438 2.832031 L 9.535156 2.832031 C 6.289062 2.832031 4.339844 7.121094 3.042969 11.410156 C 1.503906 16.492188 -0.507812 23.289062 5.316406 23.289062 L 10.222656 23.289062 C 11.6875 23.289062 12.972656 22.320312 13.375 20.910156 C 14.230469 17.929688 15.722656 12.722656 16.898438 8.761719 C 17.496094 6.75 17.992188 5.019531 18.753906 3.941406 C 19.183594 3.339844 19.894531 2.832031 20.898438 2.832031 Z M 20.898438 2.832031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial2);" d="M 13.101562 31.167969 L 24.464844 31.167969 C 27.710938 31.167969 29.660156 26.878906 30.957031 22.589844 C 32.496094 17.507812 34.507812 10.710938 28.6875 10.710938 L 23.78125 10.710938 C 22.3125 10.710938 21.027344 11.679688 20.625 13.089844 C 19.769531 16.074219 18.277344 21.277344 17.101562 25.238281 C 16.503906 27.253906 16.007812 28.980469 15.246094 30.058594 C 14.816406 30.660156 14.105469 31.167969 13.101562 31.167969 Z M 13.101562 31.167969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 13.101562 31.167969 L 24.464844 31.167969 C 27.710938 31.167969 29.660156 26.878906 30.957031 22.589844 C 32.496094 17.507812 34.507812 10.710938 28.6875 10.710938 L 23.78125 10.710938 C 22.3125 10.710938 21.027344 11.679688 20.625 13.089844 C 19.769531 16.074219 18.277344 21.277344 17.101562 25.238281 C 16.503906 27.253906 16.007812 28.980469 15.246094 30.058594 C 14.816406 30.660156 14.105469 31.167969 13.101562 31.167969 Z M 13.101562 31.167969 "/>
-</g>
 </svg>
--- a/images/X-errorMessage.svg
+++ b/images/X-errorMessage.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C8.73438 0 9.44271 0.0963542 10.125 0.289062C10.8073 0.476562 11.4427 0.744792 12.0312 1.09375C12.625 1.44271 13.1641 1.86198 13.6484 2.35156C14.138 2.83594 14.5573 3.375 14.9062 3.96875C15.2552 4.55729 15.5234 5.19271 15.7109 5.875C15.9036 6.55729 16 7.26562 16 8C16 8.73438 15.9036 9.44271 15.7109 10.125C15.5234 10.8073 15.2552 11.4453 14.9062 12.0391C14.5573 12.6276 14.138 13.1667 13.6484 13.6562C13.1641 14.1406 12.625 14.5573 12.0312 14.9062C11.4427 15.2552 10.8073 15.526 10.125 15.7188C9.44271 15.9062 8.73438 16 8 16C7.26562 16 6.55729 15.9062 5.875 15.7188C5.19271 15.526 4.55469 15.2552 3.96094 14.9062C3.3724 14.5573 2.83333 14.1406 2.34375 13.6562C1.85938 13.1667 1.44271 12.6276 1.09375 12.0391C0.744792 11.4453 0.473958 10.8073 0.28125 10.125C0.09375 9.44271 0 8.73438 0 8C0 7.26562 0.09375 6.55729 0.28125 5.875C0.473958 5.19271 0.744792 4.55729 1.09375 3.96875C1.44271 3.375 1.85938 2.83594 2.34375 2.35156C2.83333 1.86198 3.3724 1.44271 3.96094 1.09375C4.55469 0.744792 5.19271 0.476562 5.875 0.289062C6.55729 0.0963542 7.26562 0 8 0ZM8 15C8.64583 15 9.26562 14.9167 9.85938 14.75C10.4583 14.5833 11.0156 14.349 11.5312 14.0469C12.0521 13.7396 12.5234 13.375 12.9453 12.9531C13.3724 12.526 13.737 12.0547 14.0391 11.5391C14.3464 11.0182 14.5833 10.4609 14.75 9.86719C14.9167 9.26823 15 8.64583 15 8C15 7.35417 14.9167 6.73438 14.75 6.14062C14.5833 5.54167 14.3464 4.98438 14.0391 4.46875C13.737 3.94792 13.3724 3.47656 12.9453 3.05469C12.5234 2.6276 12.0521 2.26302 11.5312 1.96094C11.0156 1.65365 10.4583 1.41667 9.85938 1.25C9.26562 1.08333 8.64583 1 8 1C7.35417 1 6.73177 1.08333 6.13281 1.25C5.53906 1.41667 4.98177 1.65365 4.46094 1.96094C3.94531 2.26302 3.47396 2.6276 3.04688 3.05469C2.625 3.47656 2.26042 3.94792 1.95312 4.46875C1.65104 4.98438 1.41667 5.54167 1.25 6.14062C1.08333 6.73438 1 7.35417 1 8C1 8.64583 1.08333 9.26823 1.25 9.86719C1.41667 10.4609 1.65104 11.0182 1.95312 11.5391C2.26042 12.0547 2.625 12.526 3.04688 12.9531C3.47396 13.375 3.94531 13.7396 4.46094 14.0469C4.98177 14.349 5.53906 14.5833 6.13281 14.75C6.73177 14.9167 7.35417 15 8 15ZM11.4609 5.24219L8.71094 8L11.4609 10.7578L10.7578 11.4609L8 8.71094L5.24219 11.4609L4.53906 10.7578L7.28906 8L4.53906 5.24219L5.24219 4.53906L8 7.28906L10.7578 4.53906L11.4609 5.24219Z" fill="#E00B1C"/>
+</svg>
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -1179,16 +1179,16 @@ menuQuickStart {
  }
 }

-#tbodycontent tr.gridRowSelected {
+.gridRowSelected {
  .active();
 }

-#tbodycontent tr.gridRowSelected:hover {
+.gridRowSelected:hover {
  cursor: default;
  .hover();
 }

-#tbodycontent tr.gridRowHighlighted {
+.gridRowHighlighted {
  border-style: dotted;
  border-width: 2px;
 }
@@ -2576,10 +2576,9 @@ a:link {
 .querydropdown.placeholderVisible {
  font-style: italic;
 }
-.querydropdown.placeholderVisible::placeholder {
-  /* Chrome, Firefox, Opera, Safari 10.1+ */
+.querydropdown.placeholderVisible::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
  color: #767474;
-  opacity: 1;
+  opacity: 1; 
 }

 .querydropdown:hover {
@@ -2649,7 +2648,7 @@ a:link {

 .nav-tabs > li.active > .tabNavContentContainer > .tab_Content > .tabNavText {
  font-weight: bolder;
-  border-bottom: 2px solid rgba(0, 120, 212, 1);
+  border-bottom: 2px solid rgba(0,120,212,1);
 }

 .nav-tabs > li.active:focus > .tabNavContentContainer {
@@ -3097,3 +3096,4 @@ a:link {
  background: white;
  height: 100%;
 }
+
--- a/package-lock.json
+++ b/package-lock.json
@@ -179,11 +179,10 @@
      }
    },
    "@azure/cosmos": {
-      "version": "4.0.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/@azure/cosmos/-/cosmos-4.0.0.tgz",
-      "integrity": "sha1-X9qLNctiu82lIVm5bEw5gahD1bk=",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.16.2.tgz",
+      "integrity": "sha512-sceY5LWj0BHGj8PSyaVCfDRQLVZyoCfIY78kyIROJVEw0k+p9XFs8fhpykN8JklkCftL0WlaVY+X25SQwnhZsw==",
      "requires": {
-        "@azure/abort-controller": "^1.0.0",
        "@azure/core-auth": "^1.3.0",
        "@azure/core-rest-pipeline": "^1.2.0",
        "debug": "^4.1.1",
@@ -4073,16 +4072,6 @@
            "entities": "^2.0.0"
          }
        },
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
        "react": {
          "version": "17.0.2",
          "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
@@ -7911,50 +7900,6 @@
        }
      }
    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
    "babel-jest": {
      "version": "24.9.0",
      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
@@ -9369,41 +9314,52 @@
      }
    },
    "css-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.0.tgz",
-      "integrity": "sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
      "dev": true,
      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "icss-utils": "^2.1.0",
-        "loader-utils": "^1.0.2",
-        "lodash.camelcase": "^4.3.0",
-        "postcss": "^6.0.23",
-        "postcss-modules-extract-imports": "^1.2.0",
-        "postcss-modules-local-by-default": "^1.2.0",
-        "postcss-modules-scope": "^1.1.0",
-        "postcss-modules-values": "^1.3.0",
-        "postcss-value-parser": "^3.3.0",
-        "source-list-map": "^2.0.0"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.21",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
      },
      "dependencies": {
+        "nanoid": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+          "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+          "dev": true
+        },
        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "version": "8.4.31",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+          "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
          "dev": true,
          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "nanoid": "^3.3.6",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
          }
        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
          "dev": true
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
        }
      }
    },
@@ -9431,16 +9387,6 @@
        }
      }
    },
-    "css-selector-tokenizer": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
-      "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "fastparse": "^1.1.2"
-      }
-    },
    "css-to-react-native": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
@@ -12874,15 +12820,6 @@
        "function-bind": "^1.1.1"
      }
    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
    "has-flag": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -13392,39 +13329,11 @@
        "safer-buffer": ">= 2.1.2 < 3"
      }
    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
    "icss-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
-      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
-      "dev": true,
-      "requires": {
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true
    },
    "ieee754": {
      "version": "1.2.1",
@@ -19867,11 +19776,6 @@
      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
      "optional": true
    },
-    "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
-    },
    "nanomatch": {
      "version": "1.2.13",
      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -21021,6 +20925,11 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
    "picomatch": {
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -21212,19 +21121,18 @@
      }
    },
    "postcss": {
-      "version": "8.2.10",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz",
-      "integrity": "sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==",
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
      "requires": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.22",
+        "picocolors": "^0.2.1",
        "source-map": "^0.6.1"
      },
      "dependencies": {
-        "colorette": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
        },
        "source-map": {
          "version": "0.6.1",
@@ -21234,118 +21142,56 @@
      }
    },
    "postcss-modules-extract-imports": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
-      "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
-      "dev": true,
-      "requires": {
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true
    },
    "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
      "dev": true,
      "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
      },
      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
          "dev": true
        }
      }
    },
    "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
      "dev": true,
      "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "postcss-selector-parser": "^6.0.4"
      }
    },
    "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
      "dev": true,
      "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "icss-utils": "^5.0.0"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
      }
    },
    "postcss-value-parser": {
@@ -22134,12 +21980,6 @@
      "resolved": "https://registry.npmjs.org/react-splitter-layout/-/react-splitter-layout-4.0.0.tgz",
      "integrity": "sha512-SLqOjBOxRuizWUa83w6q5/u9cDWa9/yj9Iko9V9JFN8x+cqIXiDlUFWSx+icz3IIgvsN/oRIw3za5/32RjIwrA=="
    },
-    "react-string-format": {
-      "version": "1.0.1",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/react-string-format/-/react-string-format-1.0.1.tgz",
-      "integrity": "sha1-JyQaRZHqURInBBx64HC3FJBh3AA=",
-      "license": "MIT"
-    },
    "react-syntax-highlighter": {
      "version": "12.2.1",
      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-12.2.1.tgz",
@@ -22907,6 +22747,21 @@
          "version": "5.0.0",
          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+        },
+        "nanoid": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+          "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
+        },
+        "postcss": {
+          "version": "8.4.31",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+          "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+          "requires": {
+            "nanoid": "^3.3.6",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
+          }
        }
      }
    },
@@ -23577,17 +23432,16 @@
        }
      }
    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
    "source-map": {
      "version": "0.5.7",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    },
    "source-map-resolve": {
      "version": "0.5.3",
      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "main": "index.js",
  "dependencies": {
    "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.0.0",
+    "@azure/cosmos": "3.16.2",
    "@azure/cosmos-language-service": "0.0.5",
    "@azure/identity": "1.2.1",
    "@azure/ms-rest-nodeauth": "3.0.7",
@@ -92,7 +92,6 @@
    "react-notification-system": "0.2.17",
    "react-redux": "7.1.3",
    "react-splitter-layout": "4.0.0",
-    "react-string-format": "1.0.1",
    "react-youtube": "9.0.1",
    "redux": "4.0.4",
    "reflect-metadata": "0.1.13",
@@ -142,7 +141,7 @@
    "buffer": "5.1.0",
    "case-sensitive-paths-webpack-plugin": "2.3.0",
    "create-file-webpack": "1.0.2",
-    "css-loader": "1.0.0",
+    "css-loader": "6.8.1",
    "enzyme": "3.11.0",
    "enzyme-adapter-react-16": "1.15.5",
    "enzyme-to-json": "3.6.1",
@@ -235,4 +234,4 @@
    "printWidth": 120,
    "endOfLine": "auto"
  }
-}
+}
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -171,7 +171,6 @@ export class Areas {
  public static Tab: string = "Tab";
  public static ShareDialog: string = "Share Access Dialog";
  public static Notebook: string = "Notebook";
-  public static Copilot: string = "Copilot";
 }

 export class HttpHeaders {
--- a/src/Common/CosmosClient.test.ts
+++ b/src/Common/CosmosClient.test.ts
@@ -125,7 +125,7 @@ describe("requestPlugin", () => {
      const headers = {};
      const endpoint = "https://docs.azure.com";
      const path = "/dbs/foo";
-      requestPlugin({ endpoint, headers, path } as any, undefined, next as any);
+      requestPlugin({ endpoint, headers, path } as any, next as any);
      expect(next.mock.calls[0][0]).toMatchSnapshot();
    });
  });
@@ -137,7 +137,7 @@ describe("requestPlugin", () => {
      const headers = {};
      const endpoint = "";
      const path = "/dbs/foo";
-      requestPlugin({ endpoint, headers, path } as any, undefined, next as any);
+      requestPlugin({ endpoint, headers, path } as any, next as any);
      expect(next.mock.calls[0][0]).toMatchSnapshot();
    });
  });
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -1,16 +1,12 @@
 import * as Cosmos from "@azure/cosmos";
-import { sendCachedDataMessage } from "Common/MessageHandler";
-import { getAuthorizationTokenUsingResourceTokens } from "Common/getAuthorizationTokenUsingResourceTokens";
-import { AuthorizationToken, MessageTypes } from "Contracts/MessageTypes";
-import { checkDatabaseResourceTokensValidity } from "Platform/Fabric/FabricUtil";
-import { AuthType } from "../AuthType";
-import { PriorityLevel } from "../Common/Constants";
-import { Platform, configContext } from "../ConfigContext";
+import { configContext, Platform } from "../ConfigContext";
 import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
-import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils";
 import { EmulatorMasterKey, HttpHeaders } from "./Constants";
 import { getErrorMessage } from "./ErrorHandlingUtils";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { PriorityLevel } from "../Common/Constants";
+import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils";

 const _global = typeof self === "undefined" ? window : self;

@@ -29,36 +25,6 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
    return decodeURIComponent(headers.authorization);
  }

-  if (configContext.platform === Platform.Fabric) {
-    switch (requestInfo.resourceType) {
-      case Cosmos.ResourceType.conflicts:
-      case Cosmos.ResourceType.container:
-      case Cosmos.ResourceType.sproc:
-      case Cosmos.ResourceType.udf:
-      case Cosmos.ResourceType.trigger:
-      case Cosmos.ResourceType.item:
-      case Cosmos.ResourceType.pkranges:
-        // User resource tokens
-        headers[HttpHeaders.msDate] = new Date().toUTCString();
-        const resourceTokens = userContext.fabricDatabaseConnectionInfo.resourceTokens;
-        checkDatabaseResourceTokensValidity(userContext.fabricDatabaseConnectionInfo.resourceTokensTimestamp);
-        return getAuthorizationTokenUsingResourceTokens(resourceTokens, requestInfo.path, requestInfo.resourceId);
-
-      case Cosmos.ResourceType.none:
-      case Cosmos.ResourceType.database:
-      case Cosmos.ResourceType.offer:
-      case Cosmos.ResourceType.user:
-      case Cosmos.ResourceType.permission:
-        // User master tokens
-        const authorizationToken = await sendCachedDataMessage<AuthorizationToken>(MessageTypes.GetAuthorizationToken, [
-          requestInfo,
-        ]);
-        console.log("Response from Fabric: ", authorizationToken);
-        headers[HttpHeaders.msDate] = authorizationToken.XDate;
-        return decodeURIComponent(authorizationToken.PrimaryReadWriteToken);
-    }
-  }
-
  if (userContext.masterKey) {
    // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
    await Cosmos.setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
@@ -74,7 +40,7 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
  return decodeURIComponent(result.PrimaryReadWriteToken);
 };

-export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, diagnosticNode, next) => {
+export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, next) => {
  requestContext.endpoint = new URL(configContext.PROXY_PATH, window.location.href).href;
  requestContext.headers["x-ms-proxy-target"] = endpoint();
  return next(requestContext);
@@ -89,11 +55,7 @@ export const endpoint = () => {
  return userContext.endpoint || userContext?.databaseAccount?.properties?.documentEndpoint;
 };

-export async function getTokenFromAuthService(
-  verb: string,
-  resourceType: string,
-  resourceId?: string,
-): Promise<AuthorizationToken> {
+export async function getTokenFromAuthService(verb: string, resourceType: string, resourceId?: string): Promise<any> {
  try {
    const host = configContext.BACKEND_ENDPOINT;
    const response = await _global.fetch(host + "/api/guest/runtimeproxy/authorizationTokens", {
@@ -132,22 +94,13 @@ export function client(): Cosmos.CosmosClient {
  _defaultHeaders["x-ms-cosmos-sdk-supportedcapabilities"] =
    SDKSupportedCapabilities.None | SDKSupportedCapabilities.PartitionMerge;

-  if (
-    userContext.authType === AuthType.ConnectionString ||
-    userContext.authType === AuthType.EncryptedToken ||
-    userContext.authType === AuthType.ResourceToken
-  ) {
-    // Default to low priority. Needed for non-AAD-auth scenarios
-    // where we cannot use RP API, and thus, cannot detect whether priority
-    // based execution is enabled.
-    // The header will be ignored if priority based execution is disabled on the account.
-    _defaultHeaders["x-ms-cosmos-priority-level"] = PriorityLevel.Default;
-  }
-
  const options: Cosmos.CosmosClientOptions = {
    endpoint: endpoint() || "https://cosmos.azure.com", // CosmosClient gets upset if we pass a bad URL. This should never actually get called
    key: userContext.masterKey,
    tokenProvider,
+    connectionPolicy: {
+      enableEndpointDiscovery: false,
+    },
    userAgentSuffix: "Azure Portal",
    defaultHeaders: _defaultHeaders,
  };
@@ -156,7 +109,7 @@ export function client(): Cosmos.CosmosClient {
    (options as any).plugins = [{ on: "request", plugin: requestPlugin }];
  }

-  if (PriorityBasedExecutionUtils.isFeatureEnabled()) {
+  if (userContext.databaseAccount?.properties?.enablePriorityBasedExecution && userContext.apiType === "SQL") {
    const plugins = (options as any).plugins || [];
    plugins.push({ on: "request", plugin: PriorityBasedExecutionUtils.requestPlugin });
    (options as any).plugins = plugins;
--- a/src/Common/ErrorHandlingUtils.ts
+++ b/src/Common/ErrorHandlingUtils.ts
@@ -51,11 +51,6 @@ const replaceKnownError = (errorMessage: string): string => {
    return "Database throughput is not supported for internal subscriptions.";
  } else if (errorMessage?.indexOf("Partition key paths must contain only valid") >= 0) {
    return "Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character.";
-  } else if (
-    errorMessage?.indexOf("The user aborted a request") >= 0 ||
-    errorMessage?.indexOf("The operation was aborted") >= 0
-  ) {
-    return "User aborted query.";
  }

  return errorMessage;
--- a/src/Common/MessageHandler.ts
+++ b/src/Common/MessageHandler.ts
@@ -22,7 +22,7 @@ export function handleCachedDataMessage(message: any): void {
  if (messageContent.error != null) {
    cachedDataPromise.deferred.reject(messageContent.error);
  } else {
-    cachedDataPromise.deferred.resolve(messageContent.data);
+    cachedDataPromise.deferred.resolve(JSON.parse(messageContent.data));
  }
  runGarbageCollector();
 }
--- a/src/Common/QueriesClient.ts
+++ b/src/Common/QueriesClient.ts
@@ -13,7 +13,6 @@ import { createDocument } from "./dataAccess/createDocument";
 import { deleteDocument } from "./dataAccess/deleteDocument";
 import { queryDocuments } from "./dataAccess/queryDocuments";
 import { handleError } from "./ErrorHandlingUtils";
-import { isServerlessAccount } from "Utils/CapabilityUtils";

 export class QueriesClient {
  private static readonly PartitionKey: DataModels.PartitionKey = {
@@ -33,36 +32,25 @@ export class QueriesClient {
    }

    const clearMessage = NotificationConsoleUtils.logConsoleProgress("Setting up account for saving queries");
-
-    if (isServerlessAccount()) {
-      return createCollection({
-        collectionId: SavedQueries.CollectionName,
-        createNewDatabase: true,
-        databaseId: SavedQueries.DatabaseName,
-        partitionKey: QueriesClient.PartitionKey,
-        databaseLevelThroughput: false,
-      });
-    } else {
-      return createCollection({
-        collectionId: SavedQueries.CollectionName,
-        createNewDatabase: true,
-        databaseId: SavedQueries.DatabaseName,
-        partitionKey: QueriesClient.PartitionKey,
-        offerThroughput: SavedQueries.OfferThroughput,
-        databaseLevelThroughput: false,
-      })
-        .then(
-          (collection: DataModels.Collection) => {
-            NotificationConsoleUtils.logConsoleInfo("Successfully set up account for saving queries");
-            return Promise.resolve(collection);
-          },
-          (error: any) => {
-            handleError(error, "setupQueriesCollection", "Failed to set up account for saving queries");
-            return Promise.reject(error);
-          },
-        )
-        .finally(() => clearMessage());
-    }
+    return createCollection({
+      collectionId: SavedQueries.CollectionName,
+      createNewDatabase: true,
+      databaseId: SavedQueries.DatabaseName,
+      partitionKey: QueriesClient.PartitionKey,
+      offerThroughput: SavedQueries.OfferThroughput,
+      databaseLevelThroughput: false,
+    })
+      .then(
+        (collection: DataModels.Collection) => {
+          NotificationConsoleUtils.logConsoleInfo("Successfully set up account for saving queries");
+          return Promise.resolve(collection);
+        },
+        (error: any) => {
+          handleError(error, "setupQueriesCollection", "Failed to set up account for saving queries");
+          return Promise.reject(error);
+        },
+      )
+      .finally(() => clearMessage());
  }

  public async saveQuery(query: DataModels.Query): Promise<void> {
--- a/src/Common/dataAccess/readCollections.ts
+++ b/src/Common/dataAccess/readCollections.ts
@@ -1,57 +1,18 @@
-import { ContainerResponse } from "@azure/cosmos";
 import { Queries } from "Common/Constants";
-import { Platform, configContext } from "ConfigContext";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { listCassandraTables } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
 import { listGremlinGraphs } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
 import { listMongoDBCollections } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
 import { listSqlContainers } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
 import { listTables } from "../../Utils/arm/generatedClients/cosmos/tableResources";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";

 export async function readCollections(databaseId: string): Promise<DataModels.Collection[]> {
  const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
-
-  if (
-    configContext.platform === Platform.Fabric &&
-    userContext.fabricDatabaseConnectionInfo &&
-    userContext.fabricDatabaseConnectionInfo.databaseId === databaseId
-  ) {
-    const collections: DataModels.Collection[] = [];
-    const promises: Promise<ContainerResponse>[] = [];
-
-    for (const collectionResourceId in userContext.fabricDatabaseConnectionInfo.resourceTokens) {
-      // Dictionary key looks like this: dbs/SampleDB/colls/Container
-      const resourceIdObj = collectionResourceId.split("/");
-      const tokenDatabaseId = resourceIdObj[1];
-      const tokenCollectionId = resourceIdObj[3];
-
-      if (tokenDatabaseId === databaseId) {
-        promises.push(client().database(databaseId).container(tokenCollectionId).read());
-      }
-    }
-
-    try {
-      const responses = await Promise.all(promises);
-      responses.forEach((response) => {
-        collections.push(response.resource as DataModels.Collection);
-      });
-
-      // Sort collections by id before returning
-      collections.sort((a, b) => a.id.localeCompare(b.id));
-      return collections;
-    } catch (error) {
-      handleError(error, "ReadCollections", `Error while querying containers for database ${databaseId}`);
-      throw error;
-    } finally {
-      clearMessage();
-    }
-  }
-
  try {
    if (
      userContext.authType === AuthType.AAD &&
--- a/src/Common/dataAccess/readDatabaseOffer.ts
+++ b/src/Common/dataAccess/readDatabaseOffer.ts
@@ -1,22 +1,15 @@
-import { Platform, configContext } from "ConfigContext";
 import { AuthType } from "../../AuthType";
 import { Offer, ReadDatabaseOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { getCassandraKeyspaceThroughput } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
 import { getGremlinDatabaseThroughput } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
 import { getMongoDBDatabaseThroughput } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
 import { getSqlDatabaseThroughput } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { handleError } from "../ErrorHandlingUtils";
 import { readOfferWithSDK } from "./readOfferWithSDK";

 export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promise<Offer> => {
-  if (configContext.platform === Platform.Fabric) {
-    // TODO This works, but is very slow, because it requests the token, so we skip for now
-    console.error("Skiping readDatabaseOffer for Fabric");
-    return undefined;
-  }
-
  const clearMessage = logConsoleProgress(`Querying offer for database ${params.databaseId}`);

  try {
--- a/src/Common/dataAccess/readDatabases.ts
+++ b/src/Common/dataAccess/readDatabases.ts
@@ -1,53 +1,17 @@
-import { Platform, configContext } from "ConfigContext";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { listCassandraKeyspaces } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
 import { listGremlinDatabases } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
 import { listMongoDBDatabases } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
 import { listSqlDatabases } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";

 export async function readDatabases(): Promise<DataModels.Database[]> {
  let databases: DataModels.Database[];
  const clearMessage = logConsoleProgress(`Querying databases`);
-
-  if (configContext.platform === Platform.Fabric && userContext.fabricDatabaseConnectionInfo?.resourceTokens) {
-    const tokensData = userContext.fabricDatabaseConnectionInfo;
-
-    const databaseIdsSet = new Set<string>(); // databaseId
-
-    for (const collectionResourceId in tokensData.resourceTokens) {
-      // Dictionary key looks like this: dbs/SampleDB/colls/Container
-      const resourceIdObj = collectionResourceId.split("/");
-
-      if (resourceIdObj.length !== 4) {
-        handleError(`Resource key not recognized: ${resourceIdObj}`, "ReadDatabases", `Error while querying databases`);
-        clearMessage();
-        return [];
-      }
-
-      const databaseId = resourceIdObj[1];
-
-      databaseIdsSet.add(databaseId);
-    }
-
-    const databases: DataModels.Database[] = Array.from(databaseIdsSet.values())
-      .sort((a, b) => a.localeCompare(b))
-      .map((databaseId) => ({
-        _rid: "",
-        _self: "",
-        _etag: "",
-        _ts: 0,
-        id: databaseId,
-        collections: [],
-      }));
-    clearMessage();
-    return databases;
-  }
-
  try {
    if (
      userContext.authType === AuthType.AAD &&
--- a/src/Common/getAuthorizationTokenUsingResourceTokens.ts
+++ b/src/Common/getAuthorizationTokenUsingResourceTokens.ts
@@ -1,66 +0,0 @@
-export function getAuthorizationTokenUsingResourceTokens(
-  resourceTokens: { [resourceId: string]: string },
-  path: string,
-  resourceId: string,
-): string {
-  // console.log(`getting token for path: "${path}" and resourceId: "${resourceId}"`);
-
-  if (resourceTokens && Object.keys(resourceTokens).length > 0) {
-    // For database account access(through getDatabaseAccount API), path and resourceId are "",
-    // so in this case we return the first token to be used for creating the auth header as the
-    // service will accept any token in this case
-    if (!path && !resourceId) {
-      return resourceTokens[Object.keys(resourceTokens)[0]];
-    }
-
-    // If we have exact resource token for the path use it
-    if (resourceId && resourceTokens[resourceId]) {
-      return resourceTokens[resourceId];
-    }
-
-    // minimum valid path /dbs
-    if (!path || path.length < 4) {
-      console.error(
-        `Unable to get authotization token for Path:"${path}" and resourcerId:"${resourceId}". Invalid path.`,
-      );
-      return null;
-    }
-
-    path = trimSlashFromLeftAndRight(path);
-    const pathSegments = (path && path.split("/")) || [];
-
-    // Item path
-    if (pathSegments.length === 6) {
-      // Look for a container token matching the item path
-      const containerPath = pathSegments.slice(0, 4).map(decodeURIComponent).join("/");
-      if (resourceTokens[containerPath]) {
-        return resourceTokens[containerPath];
-      }
-    }
-
-    // This is legacy behavior that lets someone use a resource token pointing ONLY at an ID
-    // It was used when _rid was exposed by the SDK, but now that we are using user provided ids it is not needed
-    // However removing it now would be a breaking change
-    // if it's an incomplete path like /dbs/db1/colls/, start from the parent resource
-    let index = pathSegments.length % 2 === 0 ? pathSegments.length - 1 : pathSegments.length - 2;
-    for (; index > 0; index -= 2) {
-      const id = decodeURI(pathSegments[index]);
-      if (resourceTokens[id]) {
-        return resourceTokens[id];
-      }
-    }
-  }
-
-  console.error(`Unable to get authotization token for Path:"${path}" and resourcerId:"${resourceId}"`);
-  return null;
-}
-
-const trimLeftSlashes = new RegExp("^[/]+");
-const trimRightSlashes = new RegExp("[/]+$");
-function trimSlashFromLeftAndRight(inputString: string): string {
-  if (typeof inputString !== "string") {
-    throw new Error("invalid input: input is not string");
-  }
-
-  return inputString.replace(trimLeftSlashes, "").replace(trimRightSlashes, "");
-}
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -1,4 +1,3 @@
-import { JunoEndpoints } from "Common/Constants";
 import {
  allowedAadEndpoints,
  allowedArcadiaEndpoints,
@@ -65,7 +64,6 @@ let configContext: Readonly<ConfigContext> = {
    `^https:\\/\\/.*\\.fabric\\.microsoft\\.com$`,
    `^https:\\/\\/.*\\.powerbi\\.com$`,
    `^https:\\/\\/.*\\.analysis-df\\.net$`,
-    `^https:\\/\\/.*\\.analysis-df\\.windows\\.net$`,
  ], // Webpack injects this at build time
  gitSha: process.env.GIT_SHA,
  hostedExplorerURL: "https://cosmos.azure.com/",
@@ -79,7 +77,7 @@ let configContext: Readonly<ConfigContext> = {
  ARCADIA_LIVY_ENDPOINT_DNS_ZONE: "dev.azuresynapse.net",
  GITHUB_CLIENT_ID: "6cb2f63cf6f7b5cbdeca", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1189306
  GITHUB_TEST_ENV_CLIENT_ID: "b63fc8cbf87fd3c6e2eb", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1777772
-  JUNO_ENDPOINT: JunoEndpoints.Prod,
+  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
  BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
  isTerminalEnabled: false,
  isPhoenixEnabled: false,
--- a/src/Contracts/AzureResourceGraph.ts
+++ b/src/Contracts/AzureResourceGraph.ts
@@ -1,13 +0,0 @@
-export interface QueryRequestOptions {
-  $skipToken?: string;
-  $top?: number;
-  subscriptions: string[];
-}
-
-export interface QueryResponse {
-  $skipToken: string;
-  count: number;
-  data: any;
-  resultTruncated: boolean;
-  totalRecords: number;
-}
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -88,13 +88,13 @@ export interface GenerateTokenResponse {
 }

 export interface Subscription {
-  uniqueDisplayName?: string;
+  uniqueDisplayName: string;
  displayName: string;
  subscriptionId: string;
-  tenantId?: string;
+  tenantId: string;
  state: string;
-  subscriptionPolicies?: SubscriptionPolicies;
-  authorizationSource?: string;
+  subscriptionPolicies: SubscriptionPolicies;
+  authorizationSource: string;
 }

 export interface SubscriptionPolicies {
@@ -318,7 +318,7 @@ export interface CreateCollectionParams {
  collectionId: string;
  databaseId: string;
  databaseLevelThroughput: boolean;
-  offerThroughput?: number;
+  offerThroughput: number;
  analyticalStorageTtl?: number;
  autoPilotMaxThroughput?: number;
  indexingPolicy?: IndexingPolicy;
@@ -457,11 +457,8 @@ export interface ContainerInfo {
 }

 export interface IProvisionData {
-  cosmosEndpoint?: string;
+  cosmosEndpoint: string;
  poolId: string;
-  databaseId?: string;
-  containerId?: string;
-  mode?: string;
 }

 export interface IContainerData {
@@ -604,14 +601,3 @@ export enum PhoenixErrorType {
  PhoenixFlightFallback = "PhoenixFlightFallback",
  UserMissingPermissionsError = "UserMissingPermissionsError",
 }
-
-export interface CopilotEnabledConfiguration {
-  isEnabled: boolean;
-}
-
-export interface FeatureRegistration {
-  name: string;
-  properties: {
-    state: string;
-  };
-}
--- a/src/Contracts/ExplorerContracts.ts
+++ b/src/Contracts/ExplorerContracts.ts
@@ -1,6 +1,46 @@
-import { MessageTypes } from "Contracts/MessageTypes";
 import * as ActionContracts from "./ActionContracts";
 import * as Diagnostics from "./Diagnostics";
 import * as Versions from "./Versions";

-export { ActionContracts, Diagnostics, MessageTypes, Versions };
+/**
+ * Messaging types used with Data Explorer <-> Portal communication
+ * and Hosted <-> Explorer communication
+ */
+export enum MessageTypes {
+  TelemetryInfo,
+  LogInfo,
+  RefreshResources,
+  AllDatabases,
+  CollectionsForDatabase,
+  RefreshOffers,
+  AllOffers,
+  UpdateLocationHash,
+  SingleOffer,
+  RefreshOffer,
+  UpdateAccountName,
+  ForbiddenError,
+  AadSignIn,
+  GetAccessAadRequest,
+  GetAccessAadResponse,
+  UpdateAccountSwitch,
+  UpdateDirectoryControl,
+  SwitchAccount,
+  SendNotification,
+  ClearNotification,
+  ExplorerClickEvent,
+  LoadingStatus,
+  GetArcadiaToken,
+  CreateWorkspace,
+  CreateSparkPool,
+  RefreshDatabaseAccount,
+  CloseTab,
+  OpenQuickstartBlade,
+  OpenPostgreSQLPasswordReset,
+  OpenPostgresNetworkingBlade,
+  OpenCosmosDBNetworkingBlade,
+  DisplayNPSSurvey,
+  OpenVCoreMongoNetworkingBlade,
+  OpenVCoreMongoConnectionStringsBlade,
+}
+
+export { ActionContracts, Diagnostics, Versions };
--- a/src/Contracts/FabricContract.ts
+++ b/src/Contracts/FabricContract.ts
@@ -1,5 +1,3 @@
-import { AuthorizationToken, MessageTypes } from "./MessageTypes";
-
 export type FabricMessage =
  | {
      type: "newContainer";
@@ -7,71 +5,21 @@ export type FabricMessage =
    }
  | {
      type: "initialize";
-      message: {
-        endpoint: string | undefined;
-        databaseId: string | undefined;
-        resourceTokens: unknown | undefined;
-        resourceTokensTimestamp: number | undefined;
-        error: string | undefined;
-      };
+      connectionString: string | undefined;
    }
  | {
-      type: "authorizationToken";
-      message: {
-        id: string;
-        error: string | undefined;
-        data: AuthorizationToken | undefined;
-      };
-    }
-  | {
-      type: "allResourceTokens";
-      message: {
-        endpoint: string | undefined;
-        databaseId: string | undefined;
-        resourceTokens: unknown | undefined;
-        resourceTokensTimestamp: number | undefined;
-      };
+      type: "openTab";
+      databaseName: string;
+      collectionName: string | undefined;
    };

 export type DataExploreMessage =
  | "ready"
  | {
-      type: MessageTypes.TelemetryInfo;
+      type: number;
      data: {
        action: "LoadDatabases";
        actionModifier: "success" | "start";
        defaultExperience: "SQL";
      };
-    }
-  | {
-      type: MessageTypes.GetAuthorizationToken;
-      id: string;
-      params: GetCosmosTokenMessageOptions[];
-    }
-  | {
-      type: MessageTypes.GetAllResourceTokens;
    };
-
-export type GetCosmosTokenMessageOptions = {
-  verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
-  resourceType: "" | "dbs" | "colls" | "docs" | "sprocs" | "pkranges";
-  resourceId: string;
-};
-
-export type CosmosDBTokenResponse = {
-  token: string;
-  date: string;
-};
-
-export type CosmosDBConnectionInfoResponse = {
-  endpoint: string;
-  databaseId: string;
-  resourceTokens: unknown;
-};
-
-export interface FabricDatabaseConnectionInfo {
-  endpoint: string;
-  databaseId: string;
-  resourceTokens: { [resourceId: string]: string };
-  resourceTokensTimestamp: number;
-}
--- a/src/Contracts/MessageTypes.ts
+++ b/src/Contracts/MessageTypes.ts
@@ -1,49 +0,0 @@
-/**
- * Messaging types used with Data Explorer <-> Portal communication,
- * Hosted <-> Explorer communication and Data Explorer -> Fabric communication.
- */
-export enum MessageTypes {
-  TelemetryInfo,
-  LogInfo,
-  RefreshResources,
-  AllDatabases,
-  CollectionsForDatabase,
-  RefreshOffers,
-  AllOffers,
-  UpdateLocationHash,
-  SingleOffer,
-  RefreshOffer,
-  UpdateAccountName,
-  ForbiddenError,
-  AadSignIn,
-  GetAccessAadRequest,
-  GetAccessAadResponse,
-  UpdateAccountSwitch,
-  UpdateDirectoryControl,
-  SwitchAccount,
-  SendNotification,
-  ClearNotification,
-  ExplorerClickEvent,
-  LoadingStatus,
-  GetArcadiaToken,
-  CreateWorkspace,
-  CreateSparkPool,
-  RefreshDatabaseAccount,
-  CloseTab,
-  OpenQuickstartBlade,
-  OpenPostgreSQLPasswordReset,
-  OpenPostgresNetworkingBlade,
-  OpenCosmosDBNetworkingBlade,
-  DisplayNPSSurvey,
-  OpenVCoreMongoNetworkingBlade,
-  OpenVCoreMongoConnectionStringsBlade,
-
-  // Data Explorer -> Fabric communication
-  GetAuthorizationToken,
-  GetAllResourceTokens,
-}
-
-export interface AuthorizationToken {
-  XDate: string;
-  PrimaryReadWriteToken: string;
-}
--- a/src/Definitions/less.d.ts
+++ b/src/Definitions/less.d.ts
@@ -1,4 +0,0 @@
-declare module "*.less" {
-  const value: string;
-  export default value;
-}
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -129,22 +129,20 @@ export const createCollectionContextMenuButton = (
    });
  }

-  if (configContext.platform !== Platform.Fabric) {
-    items.push({
-      iconSrc: DeleteCollectionIcon,
-      onClick: () => {
-        useSelectedNode.getState().setSelectedNode(selectedCollection);
-        useSidePanel
-          .getState()
-          .openSidePanel(
-            "Delete " + getCollectionName(),
-            <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />,
-          );
-      },
-      label: `Delete ${getCollectionName()}`,
-      styleClass: "deleteCollectionMenuItem",
-    });
-  }
+  items.push({
+    iconSrc: DeleteCollectionIcon,
+    onClick: () => {
+      useSelectedNode.getState().setSelectedNode(selectedCollection);
+      useSidePanel
+        .getState()
+        .openSidePanel(
+          "Delete " + getCollectionName(),
+          <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />,
+        );
+    },
+    label: `Delete ${getCollectionName()}`,
+    styleClass: "deleteCollectionMenuItem",
+  });

  return items;
 };
--- a/src/Explorer/Controls/Editor/EditorReact.tsx
+++ b/src/Explorer/Controls/Editor/EditorReact.tsx
@@ -48,7 +48,7 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt

  public componentDidUpdate(previous: EditorReactProps) {
    if (this.props.content !== previous.content) {
-      this.editor?.setValue(this.props.content);
+      this.editor.setValue(this.props.content);
    }
  }

@@ -111,7 +111,7 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt

    this.rootNode.innerHTML = "";
    const monaco = await loadMonaco();
-    createCallback(monaco?.editor?.create(this.rootNode, options));
+    createCallback(monaco.editor.create(this.rootNode, options));

    if (this.rootNode.innerHTML) {
      this.setState({
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -123,6 +123,19 @@ describe("ContainerSampleGenerator", () => {
    await generator.createSampleContainerAsync();
  });

+  it("should not create any sample for Mongo API account", async () => {
+    const experience = "Sample generation not supported for this API Mongo";
+    updateUserContext({
+      databaseAccount: {
+        properties: {
+          capabilities: [{ name: "EnableMongo" }],
+        },
+      } as DatabaseAccount,
+    });
+
+    expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
+  });
+
  it("should not create any sample for Table API account", async () => {
    const experience = "Sample generation not supported for this API Tables";
    updateUserContext({
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -3,9 +3,7 @@ import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import { sendMessage } from "Common/MessageHandler";
 import { Platform, configContext } from "ConfigContext";
 import { MessageTypes } from "Contracts/ExplorerContracts";
-import { getCopilotEnabled, isCopilotFeatureRegistered } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { IGalleryItem } from "Juno/JunoClient";
-import { requestDatabaseResourceTokens } from "Platform/Fabric/FabricUtil";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import * as ko from "knockout";
@@ -93,7 +91,7 @@ export default class Explorer {
  };

  private static readonly MaxNbDatabasesToAutoExpand = 5;
-  public phoenixClient: PhoenixClient;
+  private phoenixClient: PhoenixClient;
  constructor() {
    const startKey: number = TelemetryProcessor.traceStart(Action.InitializeDataExplorer, {
      dataExplorerArea: Constants.Areas.ResourceTree,
@@ -275,7 +273,6 @@ export default class Explorer {

    const NINETY_DAYS_IN_MS = 7776000000;
    const ONE_DAY_IN_MS = 86400000;
-    const THREE_DAYS_IN_MS = 259200000;
    const isAccountNewerThanNinetyDays = isAccountNewerThanThresholdInMs(
      userContext.databaseAccount?.systemData?.createdAt || "",
      NINETY_DAYS_IN_MS,
@@ -295,32 +292,32 @@ export default class Explorer {
      }
    }

-    // Try Cosmos DB subscription - survey shown to 100% of users at day 1 in Data Explorer.
+    // Try Cosmos DB subscription - survey shown to random 25% of users at day 1 in Data Explorer.
    if (userContext.isTryCosmosDBSubscription) {
-      if (isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", ONE_DAY_IN_MS)) {
-        this.sendNPSMessage();
+      if (
+        isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", ONE_DAY_IN_MS) &&
+        this.getRandomInt(100) < 25
+      ) {
+        sendMessage({ type: MessageTypes.DisplayNPSSurvey });
+        localStorage.setItem("lastSubmitted", Date.now().toString());
      }
    } else {
-      // An existing account is older than 3 days but less than 90 days old. For existing account show to 100% of users in Data Explorer.
-      if (
-        !isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", THREE_DAYS_IN_MS) &&
-        isAccountNewerThanNinetyDays
-      ) {
-        this.sendNPSMessage();
+      // An existing account is lesser than 90 days old. For existing account show to random 10 % of users in Data Explorer.
+      if (isAccountNewerThanNinetyDays) {
+        if (this.getRandomInt(100) < 10) {
+          sendMessage({ type: MessageTypes.DisplayNPSSurvey });
+          localStorage.setItem("lastSubmitted", Date.now().toString());
+        }
      } else {
-        // An existing account is greater than 90 days. For existing account show to random 33% of users in Data Explorer.
-        if (this.getRandomInt(100) < 33) {
-          this.sendNPSMessage();
+        // An existing account is greater than 90 days. For existing account show to random 25 % of users in Data Explorer.
+        if (this.getRandomInt(100) < 25) {
+          sendMessage({ type: MessageTypes.DisplayNPSSurvey });
+          localStorage.setItem("lastSubmitted", Date.now().toString());
        }
      }
    }
  }

-  private sendNPSMessage() {
-    sendMessage({ type: MessageTypes.DisplayNPSSurvey });
-    localStorage.setItem("lastSubmitted", Date.now().toString());
-  }
-
  public async refreshDatabaseForResourceToken(): Promise<void> {
    const databaseId = userContext.parsedResourceToken?.databaseId;
    const collectionId = userContext.parsedResourceToken?.collectionId;
@@ -382,13 +379,6 @@ export default class Explorer {
  };

  public onRefreshResourcesClick = (): void => {
-    if (configContext.platform === Platform.Fabric) {
-      // Requesting the tokens will trigger a refresh of the databases
-      // TODO: Once the id is returned from Fabric, we can await this call and then refresh the databases here
-      requestDatabaseResourceTokens();
-      return;
-    }
-
    userContext.authType === AuthType.ResourceToken
      ? this.refreshDatabaseForResourceToken()
      : this.refreshAllDatabases();
@@ -413,7 +403,7 @@ export default class Explorer {
    this._isInitializingNotebooks = false;
  }

-  public async allocateContainer(poolId: PoolIdType, mode?: string): Promise<void> {
+  public async allocateContainer(poolId: PoolIdType): Promise<void> {
    const shouldUseNotebookStates = poolId === PoolIdType.DefaultPoolId ? true : false;
    const notebookServerInfo = shouldUseNotebookStates
      ? useNotebook.getState().notebookServerInfo
@@ -427,6 +417,10 @@ export default class Explorer {
      (notebookServerInfo === undefined ||
        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
    ) {
+      const provisionData: IProvisionData = {
+        cosmosEndpoint: userContext?.databaseAccount?.properties?.documentEndpoint,
+        poolId: shouldUseNotebookStates ? undefined : poolId,
+      };
      const connectionStatus: ContainerConnectionInfo = {
        status: ConnectionStatusType.Connecting,
      };
@@ -434,26 +428,14 @@ export default class Explorer {
      shouldUseNotebookStates && useNotebook.getState().setConnectionInfo(connectionStatus);

      let connectionInfo;
-      let provisionData: IProvisionData;
      try {
        TelemetryProcessor.traceStart(Action.PhoenixConnection, {
          dataExplorerArea: Areas.Notebook,
        });
-        if (shouldUseNotebookStates) {
-          useNotebook.getState().setIsAllocating(true);
-          provisionData = {
-            cosmosEndpoint: userContext?.databaseAccount?.properties?.documentEndpoint,
-            poolId: undefined,
-          };
-        } else {
-          useQueryCopilot.getState().setIsAllocatingContainer(true);
-          provisionData = {
-            poolId: poolId,
-            databaseId: useTabs.getState().activeTab.collection.databaseId,
-            containerId: useTabs.getState().activeTab.collection.id(),
-            mode: mode,
-          };
-        }
+        shouldUseNotebookStates
+          ? useNotebook.getState().setIsAllocating(true)
+          : useQueryCopilot.getState().setIsAllocatingContainer(true);
+
        connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
        if (!connectionInfo?.data?.phoenixServiceUrl) {
          throw new Error(`PhoenixServiceUrl is invalid!`);
@@ -469,21 +451,19 @@ export default class Explorer {
          error: getErrorMessage(error),
          errorStack: getErrorStack(error),
        });
-        if (shouldUseNotebookStates) {
-          connectionStatus.status = ConnectionStatusType.Failed;
-          shouldUseNotebookStates
-            ? useNotebook.getState().resetContainerConnection(connectionStatus)
-            : useQueryCopilot.getState().resetContainerConnection();
-          if (error?.status === HttpStatusCodes.Forbidden && error.message) {
-            useDialog.getState().showOkModalDialog("Connection Failed", `${error.message}`);
-          } else {
-            useDialog
-              .getState()
-              .showOkModalDialog(
-                "Connection Failed",
-                "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket.",
-              );
-          }
+        connectionStatus.status = ConnectionStatusType.Failed;
+        shouldUseNotebookStates
+          ? useNotebook.getState().resetContainerConnection(connectionStatus)
+          : useQueryCopilot.getState().resetContainerConnection();
+        if (error?.status === HttpStatusCodes.Forbidden && error.message) {
+          useDialog.getState().showOkModalDialog("Connection Failed", `${error.message}`);
+        } else {
+          useDialog
+            .getState()
+            .showOkModalDialog(
+              "Connection Failed",
+              "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket.",
+            );
        }
        throw error;
      } finally {
@@ -497,11 +477,11 @@ export default class Explorer {
    }
  }

-  public async setNotebookInfo(
+  private async setNotebookInfo(
    shouldUseNotebookStates: boolean,
    connectionInfo: IResponse<IPhoenixServiceInfo>,
    connectionStatus: DataModels.ContainerConnectionInfo,
-  ): Promise<void> {
+  ) {
    const containerData = {
      forwardingId: connectionInfo.data.forwardingId,
      dbAccountName: userContext.databaseAccount.name,
@@ -522,7 +502,6 @@ export default class Explorer {
    shouldUseNotebookStates
      ? useNotebook.getState().setNotebookServerInfo(noteBookServerInfo)
      : useQueryCopilot.getState().setNotebookServerInfo(noteBookServerInfo);
-
    shouldUseNotebookStates &&
      this.notebookManager?.notebookClient
        .getMemoryUsage()
@@ -1385,21 +1364,6 @@ export default class Explorer {
    await this.refreshSampleData();
  }

-  public async configureCopilot(): Promise<void> {
-    if (userContext.apiType !== "SQL" || !userContext.subscriptionId) {
-      return;
-    }
-    const copilotEnabledPromise = getCopilotEnabled();
-    const copilotUserDBEnabledPromise = isCopilotFeatureRegistered(userContext.subscriptionId);
-    const [copilotEnabled, copilotUserDBEnabled] = await Promise.all([
-      copilotEnabledPromise,
-      copilotUserDBEnabledPromise,
-    ]);
-    useQueryCopilot.getState().setCopilotEnabled(copilotEnabled);
-    useQueryCopilot.getState().setCopilotUserDBEnabled(copilotUserDBEnabled);
-    useQueryCopilot.getState().setShowWelcomeModal(window.localStorage.getItem("hideWelcomeModal") !== "true");
-  }
-
  public async refreshSampleData(): Promise<void> {
    if (!userContext.sampleDataConnectionInfo) {
      return;
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
@@ -345,7 +345,7 @@ describe("CommandBarComponentButtonFactory tests", () => {

  describe("Open Postgres and vCore Mongo buttons", () => {
    const openPostgresShellButtonLabel = "Open PSQL shell";
-    const openVCoreMongoShellButtonLabel = "Open MongoDB (vCore) shell";
+    const openVCoreMongoShellButtonLabel = "Open MongoDB (vcore) shell";

    beforeAll(() => {
      mockExplorer = {} as Explorer;
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -1,3 +1,6 @@
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
+import { ReactTabKind, useTabs } from "hooks/useTabs";
 import * as React from "react";
 import AddCollectionIcon from "../../../../images/AddCollection.svg";
 import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
@@ -47,36 +50,31 @@ export function createStaticCommandBarButtons(
    return createStaticCommandBarButtonsForResourceToken(container, selectedNodeState);
  }

+  const newCollectionBtn = createNewCollectionGroup(container);
  const buttons: CommandButtonComponentProps[] = [];

-  // Avoid starting with a divider
-  const addDivider = () => {
-    if (buttons.length > 0) {
+  buttons.push(newCollectionBtn);
+  if (
+    configContext.platform !== Platform.Fabric &&
+    userContext.apiType !== "Tables" &&
+    userContext.apiType !== "Cassandra"
+  ) {
+    const addSynapseLink = createOpenSynapseLinkDialogButton(container);
+
+    if (addSynapseLink) {
      buttons.push(createDivider());
-    }
-  };
-
-  if (configContext.platform !== Platform.Fabric) {
-    const newCollectionBtn = createNewCollectionGroup(container);
-    buttons.push(newCollectionBtn);
-    if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
-      const addSynapseLink = createOpenSynapseLinkDialogButton(container);
-
-      if (addSynapseLink) {
-        addDivider();
-        buttons.push(addSynapseLink);
-      }
-    }
-
-    if (userContext.apiType !== "Tables") {
-      newCollectionBtn.children = [createNewCollectionGroup(container)];
-      const newDatabaseBtn = createNewDatabase(container);
-      newCollectionBtn.children.push(newDatabaseBtn);
+      buttons.push(addSynapseLink);
    }
  }

+  if (userContext.apiType !== "Tables") {
+    newCollectionBtn.children = [createNewCollectionGroup(container)];
+    const newDatabaseBtn = createNewDatabase(container);
+    newCollectionBtn.children.push(newDatabaseBtn);
+  }
+
  if (useNotebook.getState().isNotebookEnabled) {
-    addDivider();
+    buttons.push(createDivider());
    const notebookButtons: CommandButtonComponentProps[] = [];

    const newNotebookButton = createNewNotebookButton(container);
@@ -130,7 +128,7 @@ export function createStaticCommandBarButtons(
    const isQuerySupported = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";

    if (isQuerySupported) {
-      addDivider();
+      buttons.push(createDivider());
      const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
      buttons.push(newSqlQueryBtn);
    }
@@ -334,8 +332,13 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
      iconSrc: AddSqlQueryIcon,
      iconAlt: label,
      onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
+        if (useSelectedNode.getState().isQueryCopilotCollectionSelected()) {
+          useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
+          traceOpen(Action.OpenQueryCopilotFromNewQuery, { apiType: userContext.apiType });
+        } else {
+          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
+        }
      },
      commandButtonLabel: label,
      ariaLabel: label,
@@ -515,7 +518,7 @@ function createOpenTerminalButtonByKind(
      case ViewModels.TerminalKind.Postgres:
        return "PSQL";
      case ViewModels.TerminalKind.VCoreMongo:
-        return "MongoDB (vCore)";
+        return "MongoDB (vcore)";
      default:
        return "";
    }
--- a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
@@ -6,7 +6,6 @@ import {
  IDropdownOption,
  IDropdownStyles,
 } from "@fluentui/react";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import * as React from "react";
 import _ from "underscore";
 import ChevronDownIcon from "../../../../images/Chevron_down.svg";
@@ -58,11 +57,7 @@ export const convertButton = (btns: CommandButtonComponentProps[], backgroundCol
        },
        onClick: (ev?: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => {
          btn.onCommandClick(ev);
-          let copilotEnabled = false;
-          if (useQueryCopilot.getState().copilotEnabled && useQueryCopilot.getState().copilotUserDBEnabled) {
-            copilotEnabled = useQueryCopilot.getState().copilotEnabledforExecution;
-          }
-          TelemetryProcessor.trace(Action.ClickCommandBarButton, ActionModifiers.Mark, { label, copilotEnabled });
+          TelemetryProcessor.trace(Action.ClickCommandBarButton, ActionModifiers.Mark, { label });
        },
        key: `${btn.commandButtonLabel}${index}`,
        text: label,
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -114,8 +114,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    super(props);

    this.state = {
-      createNewDatabase:
-        userContext.apiType !== "Tables" && configContext.platform !== Platform.Fabric && !this.props.databaseId,
+      createNewDatabase: userContext.apiType !== "Tables" && !this.props.databaseId,
      newDatabaseId: props.isQuickstart ? this.getSampleDBName() : "",
      isSharedThroughputChecked: this.getSharedThroughputDefault(),
      selectedDatabaseId:
@@ -275,38 +274,36 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              </TooltipHost>
            </Stack>

-            {configContext.platform !== Platform.Fabric && (
-              <Stack horizontal verticalAlign="center">
-                <div role="radiogroup">
-                  <input
-                    className="panelRadioBtn"
-                    checked={this.state.createNewDatabase}
-                    aria-label="Create new database"
-                    aria-checked={this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    id="databaseCreateNew"
-                    tabIndex={0}
-                    onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
-                  />
-                  <span className="panelRadioBtnLabel">Create new</span>
+            <Stack horizontal verticalAlign="center">
+              <div role="radiogroup">
+                <input
+                  className="panelRadioBtn"
+                  checked={this.state.createNewDatabase}
+                  aria-label="Create new database"
+                  aria-checked={this.state.createNewDatabase}
+                  name="databaseType"
+                  type="radio"
+                  role="radio"
+                  id="databaseCreateNew"
+                  tabIndex={0}
+                  onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
+                />
+                <span className="panelRadioBtnLabel">Create new</span>

-                  <input
-                    className="panelRadioBtn"
-                    checked={!this.state.createNewDatabase}
-                    aria-label="Use existing database"
-                    aria-checked={!this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    tabIndex={0}
-                    onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
-                  />
-                  <span className="panelRadioBtnLabel">Use existing</span>
-                </div>
-              </Stack>
-            )}
+                <input
+                  className="panelRadioBtn"
+                  checked={!this.state.createNewDatabase}
+                  aria-label="Use existing database"
+                  aria-checked={!this.state.createNewDatabase}
+                  name="databaseType"
+                  type="radio"
+                  role="radio"
+                  tabIndex={0}
+                  onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
+                />
+                <span className="panelRadioBtnLabel">Use existing</span>
+              </div>
+            </Stack>

            {this.state.createNewDatabase && (
              <Stack className="panelGroupSpacing">
@@ -1431,6 +1428,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      this.setState({ isExecuting: false });
      TelemetryProcessor.traceSuccess(Action.CreateCollection, telemetryData, startKey);
      useSidePanel.getState().closeSidePanel();
+      // open NPS Survey Dialog once the collection is created
+      this.props.explorer.openNPSSurveyDialog();
    } catch (error) {
      const errorMessage: string = getErrorMessage(error);
      this.setState({ isExecuting: false, errorMessage, showErrorDetails: true });
--- a/src/Explorer/Panes/PanelInfoErrorComponent.tsx
+++ b/src/Explorer/Panes/PanelInfoErrorComponent.tsx
@@ -32,8 +32,14 @@ export const PanelInfoErrorComponent: React.FunctionComponent<PanelInfoErrorProp
  return (
    <Stack className="panelInfoErrorContainer" horizontal verticalAlign="center">
      {icon}
-      <span className="panelWarningErrorDetailsLinkContainer" role="alert" aria-live="assertive">
-        <Text aria-label={message} className="panelWarningErrorMessage" variant="small">
+      <span className="panelWarningErrorDetailsLinkContainer">
+        <Text
+          role="alert"
+          aria-live="assertive"
+          aria-label={message}
+          className="panelWarningErrorMessage"
+          variant="small"
+        >
          {message}
          {link && linkText && (
            <Link target="_blank" href={link}>
--- a/src/Explorer/Panes/RightPaneForm/RightPaneForm.test.tsx
+++ b/src/Explorer/Panes/RightPaneForm/RightPaneForm.test.tsx
@@ -1,5 +1,5 @@
 import { fireEvent, render, screen } from "@testing-library/react";
-import { ReactWrapper, mount } from "enzyme";
+import { mount, ReactWrapper } from "enzyme";
 import React from "react";
 import { RightPaneForm } from "./RightPaneForm";

@@ -34,6 +34,6 @@ describe("Right Pane Form", () => {
  it("should render error in header", () => {
    render(<RightPaneForm {...props} formError="file already Exist" />);
    expect(screen.getByLabelText("error")).toBeDefined();
-    expect(screen.getByRole("alert").innerHTML).toContain("file already Exist");
+    expect(screen.getByRole("alert").innerHTML).toEqual("file already Exist");
  });
 });
--- a/src/Explorer/Panes/SaveQueryPane/SaveQueryPane.tsx
+++ b/src/Explorer/Panes/SaveQueryPane/SaveQueryPane.tsx
@@ -113,7 +113,6 @@ export const SaveQueryPane: FunctionComponent<SaveQueryPaneProps> = ({
        },
        startKey,
      );
-      closeSidePanel();
    } catch (error) {
      const errorMessage = getErrorMessage(error);
      traceFailure(
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -1,13 +1,4 @@
-import {
-  Checkbox,
-  ChoiceGroup,
-  IChoiceGroupOption,
-  ISpinButtonStyles,
-  IToggleStyles,
-  Position,
-  SpinButton,
-  Toggle,
-} from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -15,9 +6,8 @@ import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import * as StringUtility from "Shared/StringUtility";
 import { userContext } from "UserContext";
 import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
-import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
 import { useSidePanel } from "hooks/useSidePanel";
-import React, { FunctionComponent, useState } from "react";
+import React, { FunctionComponent, MouseEvent, useState } from "react";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

 export const SettingsPane: FunctionComponent = () => {
@@ -28,13 +18,6 @@ export const SettingsPane: FunctionComponent = () => {
      ? Constants.Queries.UnlimitedPageOption
      : Constants.Queries.CustomPageOption,
  );
-  const [queryTimeoutEnabled, setQueryTimeoutEnabled] = useState<boolean>(
-    LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled),
-  );
-  const [queryTimeout, setQueryTimeout] = useState<number>(LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout));
-  const [automaticallyCancelQueryAfterTimeout, setAutomaticallyCancelQueryAfterTimeout] = useState<boolean>(
-    LocalStorageUtility.getEntryBoolean(StorageKey.AutomaticallyCancelQueryAfterTimeout),
-  );
  const [customItemPerPage, setCustomItemPerPage] = useState<number>(
    LocalStorageUtility.getEntryNumber(StorageKey.CustomItemPerPage) || 0,
  );
@@ -68,8 +51,9 @@ export const SettingsPane: FunctionComponent = () => {
  const shouldShowGraphAutoVizOption = userContext.apiType === "Gremlin";
  const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin";
  const shouldShowParallelismOption = userContext.apiType !== "Gremlin";
-  const shouldShowPriorityLevelOption = PriorityBasedExecutionUtils.isFeatureEnabled();
-  const handlerOnSubmit = () => {
+  const shouldShowPriorityLevelOption =
+    userContext.databaseAccount?.properties?.enablePriorityBasedExecution && userContext.apiType === "SQL";
+  const handlerOnSubmit = (e: MouseEvent<HTMLButtonElement>) => {
    setIsExecuting(true);

    LocalStorageUtility.setEntryNumber(
@@ -77,7 +61,6 @@ export const SettingsPane: FunctionComponent = () => {
      isCustomPageOptionSelected() ? customItemPerPage : Constants.Queries.unlimitedItemsPerPage,
    );
    LocalStorageUtility.setEntryNumber(StorageKey.CustomItemPerPage, customItemPerPage);
-    LocalStorageUtility.setEntryBoolean(StorageKey.QueryTimeoutEnabled, queryTimeoutEnabled);
    LocalStorageUtility.setEntryString(StorageKey.ContainerPaginationEnabled, containerPaginationEnabled.toString());
    LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, crossPartitionQueryEnabled.toString());
    LocalStorageUtility.setEntryNumber(StorageKey.MaxDegreeOfParellism, maxDegreeOfParallelism);
@@ -90,14 +73,6 @@ export const SettingsPane: FunctionComponent = () => {
      );
    }

-    if (queryTimeoutEnabled) {
-      LocalStorageUtility.setEntryNumber(StorageKey.QueryTimeout, queryTimeout);
-      LocalStorageUtility.setEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-        automaticallyCancelQueryAfterTimeout,
-      );
-    }
-
    setIsExecuting(false);
    logConsoleInfo(
      `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
@@ -122,6 +97,7 @@ export const SettingsPane: FunctionComponent = () => {
      `Updated query setting to ${LocalStorageUtility.getEntryString(StorageKey.SetPartitionKeyUndefined)}`,
    );
    closeSidePanel();
+    e.preventDefault();
  };

  const isCustomPageOptionSelected = () => {
@@ -136,7 +112,7 @@ export const SettingsPane: FunctionComponent = () => {
    formError: "",
    isExecuting,
    submitButtonText: "Apply",
-    onSubmit: () => handlerOnSubmit(),
+    onSubmit: () => handlerOnSubmit(undefined),
  };
  const pageOptionList: IChoiceGroupOption[] = [
    { key: Constants.Queries.CustomPageOption, text: "Custom" },
@@ -164,21 +140,6 @@ export const SettingsPane: FunctionComponent = () => {
    setPageOption(option.key);
  };

-  const handleOnQueryTimeoutToggleChange = (ev: React.MouseEvent<HTMLElement>, checked?: boolean): void => {
-    setQueryTimeoutEnabled(checked);
-  };
-
-  const handleOnAutomaticallyCancelQueryToggleChange = (ev: React.MouseEvent<HTMLElement>, checked?: boolean): void => {
-    setAutomaticallyCancelQueryAfterTimeout(checked);
-  };
-
-  const handleOnQueryTimeoutSpinButtonChange = (ev: React.MouseEvent<HTMLElement>, newValue?: string): void => {
-    const queryTimeout = Number(newValue);
-    if (!isNaN(queryTimeout)) {
-      setQueryTimeout(queryTimeout);
-    }
-  };
-
  const choiceButtonStyles = {
    root: {
      clear: "both",
@@ -200,35 +161,6 @@ export const SettingsPane: FunctionComponent = () => {
      },
    ],
  };
-
-  const queryTimeoutToggleStyles: IToggleStyles = {
-    label: {
-      fontSize: 12,
-      fontWeight: 400,
-      display: "block",
-    },
-    root: {},
-    container: {},
-    pill: {},
-    thumb: {},
-    text: {},
-  };
-
-  const queryTimeoutSpinButtonStyles: ISpinButtonStyles = {
-    label: {
-      fontSize: 12,
-      fontWeight: 400,
-    },
-    root: {
-      paddingBottom: 10,
-    },
-    labelWrapper: {},
-    icon: {},
-    spinButtonWrapper: {},
-    input: {},
-    arrowButtonsContainer: {},
-  };
-
  return (
    <RightPaneForm {...genericPaneProps}>
      <div className="paneMainContent">
@@ -279,50 +211,6 @@ export const SettingsPane: FunctionComponent = () => {
            </div>
          </div>
        )}
-        {userContext.apiType === "SQL" && (
-          <div className="settingsSection">
-            <div className="settingsSectionPart">
-              <div>
-                <legend id="queryTimeoutLabel" className="settingsSectionLabel legendLabel">
-                  Query Timeout
-                </legend>
-                <InfoTooltip>
-                  When a query reaches a specified time limit, a popup with an option to cancel the query will show
-                  unless automatic cancellation has been enabled
-                </InfoTooltip>
-              </div>
-              <div>
-                <Toggle
-                  styles={queryTimeoutToggleStyles}
-                  label="Enable query timeout"
-                  onChange={handleOnQueryTimeoutToggleChange}
-                  defaultChecked={queryTimeoutEnabled}
-                />
-              </div>
-              {queryTimeoutEnabled && (
-                <div>
-                  <SpinButton
-                    label="Query timeout (ms)"
-                    labelPosition={Position.top}
-                    defaultValue={(queryTimeout || 5000).toString()}
-                    min={100}
-                    step={1000}
-                    onChange={handleOnQueryTimeoutSpinButtonChange}
-                    incrementButtonAriaLabel="Increase value by 1000"
-                    decrementButtonAriaLabel="Decrease value by 1000"
-                    styles={queryTimeoutSpinButtonStyles}
-                  />
-                  <Toggle
-                    label="Automatically cancel query after timeout"
-                    styles={queryTimeoutToggleStyles}
-                    onChange={handleOnAutomaticallyCancelQueryToggleChange}
-                    defaultChecked={automaticallyCancelQueryAfterTimeout}
-                  />
-                </div>
-              )}
-            </div>
-          </div>
-        )}
        <div className="settingsSection">
          <div className="settingsSectionPart">
            <div className="settingsSectionLabel">
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -97,46 +97,6 @@ exports[`Settings Pane should render Default properly 1`] = `
        </div>
      </div>
    </div>
-    <div
-      className="settingsSection"
-    >
-      <div
-        className="settingsSectionPart"
-      >
-        <div>
-          <legend
-            className="settingsSectionLabel legendLabel"
-            id="queryTimeoutLabel"
-          >
-            Query Timeout
-          </legend>
-          <InfoTooltip>
-            When a query reaches a specified time limit, a popup with an option to cancel the query will show unless automatic cancellation has been enabled
-          </InfoTooltip>
-        </div>
-        <div>
-          <StyledToggleBase
-            defaultChecked={false}
-            label="Enable query timeout"
-            onChange={[Function]}
-            styles={
-              Object {
-                "container": Object {},
-                "label": Object {
-                  "display": "block",
-                  "fontSize": 12,
-                  "fontWeight": 400,
-                },
-                "pill": Object {},
-                "root": Object {},
-                "text": Object {},
-                "thumb": Object {},
-              }
-            }
-          />
-        </div>
-      </div>
-    </div>
    <div
      className="settingsSection"
    >
--- a/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/EditTableEntityPanel.tsx
@@ -390,9 +390,6 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
          </Stack>
        )}
      </div>
-      <div className="panelNullWarning" style={{ padding: "20px", color: "red" }}>
-        Warning: Null fields will not be displayed for editing.
-      </div>
    </RightPaneForm>
  );
 };
--- a/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
@@ -355,17 +355,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
          </div>
        </Stack>
      </div>
-      <div
-        className="panelNullWarning"
-        style={
-          Object {
-            "color": "red",
-            "padding": "20px",
-          }
-        }
-      >
-        Warning: Null fields will not be displayed for editing.
-      </div>
      <PanelFooterComponent
        buttonLabel="Update"
        isButtonDisabled={false}
--- a/src/Explorer/Panes/snapshots/AddCollectionPanel.test.tsx.snap
+++ b/src/Explorer/Panes/snapshots/AddCollectionPanel.test.tsx.snap
@@ -336,8 +336,7 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          directionalHint={4}
        >
          <Icon
-            ariaLabel="Enable analytical store capability to perform near real-time analytics on your operational data, without
- impacting the performance of transactional workloads."
+            ariaLabel="Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads."
            className="panelInfoIcon"
            iconName="Info"
            tabIndex={0}
--- a/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
+++ b/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
@@ -323,19 +323,21 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
              </IconBase>
            </StyledIconBase>
            <span
-              aria-live="assertive"
              className="panelWarningErrorDetailsLinkContainer"
              key=".0:$.1"
-              role="alert"
            >
              <Text
                aria-label="Warning! The action you are about to take cannot be undone. Continuing will permanently delete this resource and all of its children resources."
+                aria-live="assertive"
                className="panelWarningErrorMessage"
+                role="alert"
                variant="small"
              >
                <span
                  aria-label="Warning! The action you are about to take cannot be undone. Continuing will permanently delete this resource and all of its children resources."
+                  aria-live="assertive"
                  className="panelWarningErrorMessage css-56"
+                  role="alert"
                >
                  Warning! The action you are about to take cannot be undone. Continuing will permanently delete this resource and all of its children resources.
                </span>
--- a/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx
+++ b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.test.tsx
@@ -1,10 +1,10 @@
-import { Checkbox, DefaultButton, IconButton, PrimaryButton, TextField } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, DefaultButton, IconButton, PrimaryButton, TextField } from "@fluentui/react";
 import Explorer from "Explorer/Explorer";
 import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
-import { useCopilotStore } from "Explorer/QueryCopilot/QueryCopilotContext";
 import { SubmitFeedback } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { getUserEmail } from "Utils/UserUtils";
 import { shallow } from "enzyme";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";

 jest.mock("Utils/UserUtils");
@@ -13,49 +13,21 @@ jest.mock("Utils/UserUtils");
 jest.mock("Explorer/QueryCopilot/Shared/QueryCopilotClient");
 SubmitFeedback as jest.Mock;

-jest.mock("Explorer/QueryCopilot/QueryCopilotContext");
-const mockUseCopilotStore = useCopilotStore as jest.Mock;
-const mockReturnValue = {
-  generatedQuery: "test query",
-  userPrompt: "test prompt",
-  likeQuery: false,
-  showFeedbackModal: false,
-  closeFeedbackModal: jest.fn,
-  setHideFeedbackModalForLikedQueries: jest.fn,
-};
-
 describe("Query Copilot Feedback Modal snapshot test", () => {
  beforeEach(() => {
-    mockUseCopilotStore.mockReturnValue(mockReturnValue);
    jest.clearAllMocks();
  });
  it("shoud render and match snapshot", () => {
-    mockUseCopilotStore.mockReturnValue({
-      ...mockReturnValue,
-      showFeedbackModal: true,
-    });
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    useQueryCopilot.getState().openFeedbackModal("test query", false, "test prompt");
+
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);

    expect(wrapper.props().isOpen).toBeTruthy();
    expect(wrapper).toMatchSnapshot();
  });

  it("should close on cancel click", () => {
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);

    const cancelButton = wrapper.find(IconButton);
    cancelButton.simulate("click");
@@ -66,14 +38,7 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
  });

  it("should get user unput", () => {
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);
    const testUserInput = "test user input";

    const userInput = wrapper.find(TextField).first();
@@ -83,15 +48,30 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
    expect(wrapper).toMatchSnapshot();
  });

+  it("should record user contact choice no", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);
+    const contactAllowed = wrapper.find(ChoiceGroup);
+
+    contactAllowed.simulate("change", {}, { key: "no" });
+
+    expect(getUserEmail).toHaveBeenCalledTimes(3);
+    expect(wrapper.find(ChoiceGroup).props().selectedKey).toEqual("no");
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should record user contact choice yes", () => {
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);
+    const contactAllowed = wrapper.find(ChoiceGroup);
+
+    contactAllowed.simulate("change", {}, { key: "yes" });
+
+    expect(getUserEmail).toHaveBeenCalledTimes(4);
+    expect(wrapper.find(ChoiceGroup).props().selectedKey).toEqual("yes");
+    expect(wrapper).toMatchSnapshot();
+  });
+
  it("should not render dont show again button", () => {
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);

    const dontShowAgain = wrapper.find(Checkbox);

@@ -100,19 +80,8 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
  });

  it("should render dont show again button and check it ", () => {
-    mockUseCopilotStore.mockReturnValue({
-      ...mockReturnValue,
-      showFeedbackModal: true,
-      likeQuery: true,
-    });
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    useQueryCopilot.getState().openFeedbackModal("test query", true, "test prompt");
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);

    const dontShowAgain = wrapper.find(Checkbox);
    dontShowAgain.simulate("change", {}, true);
@@ -123,14 +92,7 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
  });

  it("should cancel submission", () => {
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={new Explorer()}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={new Explorer()} />);

    const cancelButton = wrapper.find(DefaultButton);
    cancelButton.simulate("click");
@@ -140,49 +102,22 @@ describe("Query Copilot Feedback Modal snapshot test", () => {
    expect(wrapper).toMatchSnapshot();
  });

-  it("should not submit submission if required description field is null", () => {
+  it("should submit submission", () => {
    const explorer = new Explorer();
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={explorer}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
+    const wrapper = shallow(<QueryCopilotFeedbackModal explorer={explorer} />);

    const submitButton = wrapper.find(PrimaryButton);
    submitButton.simulate("click");
    wrapper.setProps({});

-    expect(SubmitFeedback).toHaveBeenCalledTimes(0);
-  });
-
-  it("should submit submission", () => {
-    const explorer = new Explorer();
-    const wrapper = shallow(
-      <QueryCopilotFeedbackModal
-        explorer={explorer}
-        databaseId="CopilotUserDb"
-        containerId="CopilotUserContainer"
-        mode="User"
-      />,
-    );
-
-    const submitButton = wrapper.find("form");
-    submitButton.simulate("submit");
-    wrapper.setProps({});
-
    expect(SubmitFeedback).toHaveBeenCalledTimes(1);
    expect(SubmitFeedback).toHaveBeenCalledWith({
-      containerId: "CopilotUserContainer",
-      databaseId: "CopilotUserDb",
-      mode: "User",
      params: {
        likeQuery: false,
-        generatedQuery: "test query",
-        userPrompt: "test prompt",
+        generatedQuery: "",
+        userPrompt: "",
        description: "",
+        contact: getUserEmail(),
      },
      explorer: explorer,
    });
--- a/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
+++ b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
@@ -1,5 +1,6 @@
 import {
  Checkbox,
+  ChoiceGroup,
  DefaultButton,
  IconButton,
  Link,
@@ -10,21 +11,12 @@ import {
  TextField,
 } from "@fluentui/react";
 import Explorer from "Explorer/Explorer";
-import { useCopilotStore } from "Explorer/QueryCopilot/QueryCopilotContext";
 import { SubmitFeedback } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
+import { getUserEmail } from "../../../Utils/UserUtils";

-export const QueryCopilotFeedbackModal = ({
-  explorer,
-  databaseId,
-  containerId,
-  mode,
-}: {
-  explorer: Explorer;
-  databaseId: string;
-  containerId: string;
-  mode: string;
-}): JSX.Element => {
+export const QueryCopilotFeedbackModal = ({ explorer }: { explorer: Explorer }): JSX.Element => {
  const {
    generatedQuery,
    userPrompt,
@@ -32,72 +24,94 @@ export const QueryCopilotFeedbackModal = ({
    showFeedbackModal,
    closeFeedbackModal,
    setHideFeedbackModalForLikedQueries,
-  } = useCopilotStore();
+  } = useQueryCopilot();
+  const [isContactAllowed, setIsContactAllowed] = React.useState<boolean>(true);
  const [description, setDescription] = React.useState<string>("");
  const [doNotShowAgainChecked, setDoNotShowAgainChecked] = React.useState<boolean>(false);
-
-  const handleSubmit = () => {
-    closeFeedbackModal();
-    setHideFeedbackModalForLikedQueries(doNotShowAgainChecked);
-    SubmitFeedback({
-      params: { generatedQuery, likeQuery, description, userPrompt },
-      explorer,
-      databaseId,
-      containerId,
-      mode: mode,
-    });
-  };
+  const [contact, setContact] = React.useState<string>(getUserEmail());

  return (
    <Modal isOpen={showFeedbackModal}>
-      <form onSubmit={handleSubmit}>
-        <Stack style={{ padding: 24 }}>
-          <Stack horizontal horizontalAlign="space-between">
-            <Text style={{ fontSize: 20, fontWeight: 600, marginBottom: 20 }}>Send feedback to Microsoft</Text>
-            <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => closeFeedbackModal()} />
-          </Stack>
-          <Text style={{ fontSize: 14, marginBottom: 14 }}>Your feedback will help improve the experience.</Text>
-          <TextField
-            styles={{ root: { marginBottom: 14 } }}
-            label="Description"
-            required
-            placeholder="Provide more details"
-            value={description}
-            onChange={(_, newValue) => setDescription(newValue)}
-            multiline
-            rows={3}
-          />
-          <TextField
-            styles={{ root: { marginBottom: 14 } }}
-            label="Query generated"
-            defaultValue={generatedQuery}
-            readOnly
-          />
-          <Text style={{ fontSize: 12, marginBottom: 14 }}>
-            By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the{" "}
-            {
-              <Link href="https://privacy.microsoft.com/privacystatement" target="_blank">
-                Privacy statement
-              </Link>
-            }{" "}
-            for more information.
-          </Text>
-          {likeQuery && (
-            <Checkbox
-              styles={{ label: { paddingLeft: 0 }, root: { marginBottom: 14 } }}
-              label="Don't show me this next time"
-              checked={doNotShowAgainChecked}
-              onChange={(_, checked) => setDoNotShowAgainChecked(checked)}
-            />
-          )}
-          <Stack horizontal horizontalAlign="end">
-            <PrimaryButton styles={{ root: { marginRight: 8 } }} type="submit">
-              Submit
-            </PrimaryButton>
-            <DefaultButton onClick={() => closeFeedbackModal()}>Cancel</DefaultButton>
-          </Stack>
+      <Stack style={{ padding: 24 }}>
+        <Stack horizontal horizontalAlign="space-between">
+          <Text style={{ fontSize: 20, fontWeight: 600, marginBottom: 20 }}>Send feedback to Microsoft</Text>
+          <IconButton iconProps={{ iconName: "Cancel" }} onClick={() => closeFeedbackModal()} />
        </Stack>
-      </form>
+        <Text style={{ fontSize: 14, marginBottom: 14 }}>Your feedback will help improve the experience.</Text>
+        <TextField
+          styles={{ root: { marginBottom: 14 } }}
+          label="Description"
+          required
+          placeholder="Provide more details"
+          value={description}
+          onChange={(_, newValue) => setDescription(newValue)}
+          multiline
+          rows={3}
+        />
+        <TextField
+          styles={{ root: { marginBottom: 14 } }}
+          label="Query generated"
+          defaultValue={generatedQuery}
+          readOnly
+        />
+        <ChoiceGroup
+          styles={{
+            root: {
+              marginBottom: 14,
+            },
+            flexContainer: {
+              selectors: {
+                ".ms-ChoiceField-field::before": { marginTop: 4 },
+                ".ms-ChoiceField-field::after": { marginTop: 4 },
+                ".ms-ChoiceFieldLabel": { paddingLeft: 6 },
+              },
+            },
+          }}
+          label="May we contact you about your feedback?"
+          options={[
+            { key: "yes", text: "Yes, you may contact me." },
+            { key: "no", text: "No, do not contact me." },
+          ]}
+          selectedKey={isContactAllowed ? "yes" : "no"}
+          onChange={(_, option) => {
+            setIsContactAllowed(option.key === "yes");
+            setContact(option.key === "yes" ? getUserEmail() : "");
+          }}
+        ></ChoiceGroup>
+        <Text style={{ fontSize: 12, marginBottom: 14 }}>
+          By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the{" "}
+          {
+            <Link href="https://privacy.microsoft.com/privacystatement" target="_blank">
+              Privacy statement
+            </Link>
+          }{" "}
+          for more information.
+        </Text>
+        {likeQuery && (
+          <Checkbox
+            styles={{ label: { paddingLeft: 0 }, root: { marginBottom: 14 } }}
+            label="Don't show me this next time"
+            checked={doNotShowAgainChecked}
+            onChange={(_, checked) => setDoNotShowAgainChecked(checked)}
+          />
+        )}
+        <Stack horizontal horizontalAlign="end">
+          <PrimaryButton
+            styles={{ root: { marginRight: 8 } }}
+            onClick={() => {
+              closeFeedbackModal();
+              setHideFeedbackModalForLikedQueries(doNotShowAgainChecked);
+              SubmitFeedback({
+                params: { generatedQuery, likeQuery, description, userPrompt, contact },
+                explorer: explorer,
+              });
+            }}
+          >
+            Submit
+          </PrimaryButton>
+          <DefaultButton onClick={() => closeFeedbackModal()}>Cancel</DefaultButton>
+        </Stack>
+      </Stack>
    </Modal>
  );
 };
--- a/src/Explorer/QueryCopilot/Modal/WelcomeModal.css
+++ b/src/Explorer/QueryCopilot/Modal/WelcomeModal.css
@@ -1,6 +1,7 @@
 .modalContentPadding {
  padding-top: 15px;
  width: 513px;
+  height: 638px;
 }

 .exitPadding {
@@ -38,7 +39,7 @@
 }

 .buttonPadding {
-  padding: 15px 0px 15px 0px;
+  padding: 15px 0px 0px 0px;
 }

 .tryButton {
--- a/src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx
+++ b/src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx
@@ -1,7 +1,7 @@
 import { IconButton, Image, Link, Modal, PrimaryButton, Stack, StackItem, Text } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import React from "react";
+import Database from "../../../../images/CopilotDatabase.svg";
 import Flash from "../../../../images/CopilotFlash.svg";
 import Thumb from "../../../../images/CopilotThumb.svg";
 import CoplilotWelcomeIllustration from "../../../../images/CopliotWelcomeIllustration.svg";
@@ -14,11 +14,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
    if (visible) {
      window.localStorage.setItem("hideWelcomeModal", "true");
    }
-  }, []);
-
-  React.useEffect(() => {
-    useQueryCopilot.getState().setShowWelcomeModal(isModalVisible);
-  }, [isModalVisible]);
+  });

  return (
    <>
@@ -27,10 +23,8 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
        onDismiss={hideModal}
        isBlocking={false}
        styles={{
-          main: {
-            maxHeight: 600,
-            borderRadius: 10,
-            overflow: "hidden",
+          scrollableContent: {
+            minHeight: 680,
          },
        }}
      >
@@ -58,7 +52,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
          </Stack>
          <Stack horizontalAlign="center">
            <Stack.Item align="center" style={{ textAlign: "center" }}>
-              <Text className="title bold">Welcome to Microsoft Copilot for Azure in Cosmos DB (preview)</Text>
+              <Text className="title bold">Welcome to Query Copilot for Azure Cosmos DB (Private Preview)</Text>
            </Stack.Item>
            <Stack.Item align="center" className="text">
              <Stack horizontal>
@@ -67,7 +61,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
                </StackItem>
                <StackItem align="start">
                  <Text className="bold">
-                    Let Copilot do the work for you
+                    Let Query Copilot do the work for you
                    <br />
                  </Text>
                </StackItem>
@@ -75,7 +69,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
              <Text>
                Ask Copilot to generate a query by describing the query in your words.
                <br />
-                <Link target="_blank" href="https://aka.ms/MicrosoftCopilotForAzureInCDBHowTo">
+                <Link target="_blank" href="https://aka.ms/cdb-copilot-learn-more">
                  Learn more
                </Link>
              </Text>
@@ -93,11 +87,31 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
                </StackItem>
              </Stack>
              <Text>
-                AI-generated content can have mistakes. Make sure it is accurate and appropriate before executing the
-                query.
+                AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
                <br />
                <Link target="_blank" href="https://aka.ms/cdb-copilot-preview-terms">
-                  Read our preview terms here
+                  Read preview terms
+                </Link>
+              </Text>
+            </Stack.Item>
+            <Stack.Item align="center" className="text">
+              <Stack horizontal>
+                <StackItem align="start" className="imageTextPadding">
+                  <Image src={Database} />
+                </StackItem>
+                <StackItem align="start">
+                  <Text className="bold">
+                    Query Copilot works on a sample database.
+                    <br />
+                  </Text>
+                </StackItem>
+              </Stack>
+              <Text>
+                While in Private Preview, Query Copilot is setup to work on sample database we have configured for you
+                at no cost.
+                <br />
+                <Link target="_blank" href="https://aka.ms/cdb-copilot-learn-more">
+                  Learn more
                </Link>
              </Text>
            </Stack.Item>
--- a/src/Explorer/QueryCopilot/Modal/snapshots/QueryCopilotFeedbackModal.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Modal/snapshots/QueryCopilotFeedbackModal.test.tsx.snap
--- a/src/Explorer/QueryCopilot/Modal/snapshots/WelcomeModal.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Modal/snapshots/WelcomeModal.test.tsx.snap
@@ -8,10 +8,8 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
    onDismiss={[Function]}
    styles={
      Object {
-        "main": Object {
-          "borderRadius": 10,
-          "maxHeight": 600,
-          "overflow": "hidden",
+        "scrollableContent": Object {
+          "minHeight": 680,
        },
      }
    }
@@ -78,7 +76,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
          <Text
            className="title bold"
          >
-            Welcome to Microsoft Copilot for Azure in Cosmos DB (preview)
+            Welcome to Query Copilot for Azure Cosmos DB (Private Preview)
          </Text>
        </StackItem>
        <StackItem
@@ -102,7 +100,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
              <Text
                className="bold"
              >
-                Let Copilot do the work for you
+                Let Query Copilot do the work for you
                <br />
              </Text>
            </StackItem>
@@ -111,7 +109,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
            Ask Copilot to generate a query by describing the query in your words.
            <br />
            <StyledLinkBase
-              href="https://aka.ms/MicrosoftCopilotForAzureInCDBHowTo"
+              href="https://aka.ms/cdb-copilot-learn-more"
              target="_blank"
            >
              Learn more
@@ -145,13 +143,50 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
            </StackItem>
          </Stack>
          <Text>
-            AI-generated content can have mistakes. Make sure it is accurate and appropriate before executing the query.
+            AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
            <br />
            <StyledLinkBase
              href="https://aka.ms/cdb-copilot-preview-terms"
              target="_blank"
            >
-              Read our preview terms here
+              Read preview terms
+            </StyledLinkBase>
+          </Text>
+        </StackItem>
+        <StackItem
+          align="center"
+          className="text"
+        >
+          <Stack
+            horizontal={true}
+          >
+            <StackItem
+              align="start"
+              className="imageTextPadding"
+            >
+              <Image
+                src={Object {}}
+              />
+            </StackItem>
+            <StackItem
+              align="start"
+            >
+              <Text
+                className="bold"
+              >
+                Query Copilot works on a sample database.
+                <br />
+              </Text>
+            </StackItem>
+          </Stack>
+          <Text>
+            While in Private Preview, Query Copilot is setup to work on sample database we have configured for you at no cost.
+            <br />
+            <StyledLinkBase
+              href="https://aka.ms/cdb-copilot-learn-more"
+              target="_blank"
+            >
+              Learn more
            </StyledLinkBase>
          </Text>
        </StackItem>
--- a/src/Explorer/QueryCopilot/QueryCopilotContext.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotContext.tsx
@@ -1,135 +0,0 @@
-import { MinimalQueryIterator } from "Common/IteratorUtilities";
-import { QueryResults } from "Contracts/ViewModels";
-import { CopilotMessage } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
-import { guid } from "Explorer/Tables/Utilities";
-import { QueryCopilotState } from "hooks/useQueryCopilot";
-
-import React, { createContext, useContext, useState } from "react";
-import create from "zustand";
-const context = createContext(null);
-const useCopilotStore = (): Partial<QueryCopilotState> => useContext(context);
-
-const CopilotProvider = ({ children }: { children: React.ReactNode }): JSX.Element => {
-  const [useStore] = useState(() =>
-    create((set, get) => ({
-      generatedQuery: "",
-      likeQuery: false,
-      userPrompt: "",
-      showFeedbackModal: false,
-      hideFeedbackModalForLikedQueries: false,
-      correlationId: "",
-      query: "SELECT * FROM c",
-      selectedQuery: "",
-      isGeneratingQuery: false,
-      isGeneratingExplanation: false,
-      isExecuting: false,
-      dislikeQuery: undefined,
-      showCallout: false,
-      showSamplePrompts: false,
-      queryIterator: undefined,
-      queryResults: undefined,
-      errorMessage: "",
-      isSamplePromptsOpen: false,
-      showDeletePopup: false,
-      showFeedbackBar: false,
-      showCopyPopup: false,
-      showErrorMessageBar: false,
-      showInvalidQueryMessageBar: false,
-      generatedQueryComments: "",
-      wasCopilotUsed: false,
-      showWelcomeSidebar: true,
-      showCopilotSidebar: false,
-      chatMessages: [],
-      shouldIncludeInMessages: true,
-      showExplanationBubble: false,
-      isAllocatingContainer: false,
-
-      openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) =>
-        set({ generatedQuery, likeQuery, userPrompt, showFeedbackModal: true }),
-      closeFeedbackModal: () => set({ showFeedbackModal: false }),
-      setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) =>
-        set({ hideFeedbackModalForLikedQueries }),
-      refreshCorrelationId: () => set({ correlationId: guid() }),
-      setUserPrompt: (userPrompt: string) => set({ userPrompt }),
-      setQuery: (query: string) => set({ query }),
-      setGeneratedQuery: (generatedQuery: string) => set({ generatedQuery }),
-      setSelectedQuery: (selectedQuery: string) => set({ selectedQuery }),
-      setIsGeneratingQuery: (isGeneratingQuery: boolean) => set({ isGeneratingQuery }),
-      setIsGeneratingExplanation: (isGeneratingExplanation: boolean) => set({ isGeneratingExplanation }),
-      setIsExecuting: (isExecuting: boolean) => set({ isExecuting }),
-      setLikeQuery: (likeQuery: boolean) => set({ likeQuery }),
-      setDislikeQuery: (dislikeQuery: boolean | undefined) => set({ dislikeQuery }),
-      setShowCallout: (showCallout: boolean) => set({ showCallout }),
-      setShowSamplePrompts: (showSamplePrompts: boolean) => set({ showSamplePrompts }),
-      setQueryIterator: (queryIterator: MinimalQueryIterator | undefined) => set({ queryIterator }),
-      setQueryResults: (queryResults: QueryResults | undefined) => set({ queryResults }),
-      setErrorMessage: (errorMessage: string) => set({ errorMessage }),
-      setIsSamplePromptsOpen: (isSamplePromptsOpen: boolean) => set({ isSamplePromptsOpen }),
-      setShowDeletePopup: (showDeletePopup: boolean) => set({ showDeletePopup }),
-      setShowFeedbackBar: (showFeedbackBar: boolean) => set({ showFeedbackBar }),
-      setshowCopyPopup: (showCopyPopup: boolean) => set({ showCopyPopup }),
-      setShowErrorMessageBar: (showErrorMessageBar: boolean) => set({ showErrorMessageBar }),
-      setShowInvalidQueryMessageBar: (showInvalidQueryMessageBar: boolean) => set({ showInvalidQueryMessageBar }),
-      setGeneratedQueryComments: (generatedQueryComments: string) => set({ generatedQueryComments }),
-      setWasCopilotUsed: (wasCopilotUsed: boolean) => set({ wasCopilotUsed }),
-      setShowWelcomeSidebar: (showWelcomeSidebar: boolean) => set({ showWelcomeSidebar }),
-      setShowCopilotSidebar: (showCopilotSidebar: boolean) => set({ showCopilotSidebar }),
-      setChatMessages: (chatMessages: CopilotMessage[]) => set({ chatMessages }),
-      setShouldIncludeInMessages: (shouldIncludeInMessages: boolean) => set({ shouldIncludeInMessages }),
-      setShowExplanationBubble: (showExplanationBubble: boolean) => set({ showExplanationBubble }),
-
-      getState: () => {
-        return get();
-      },
-
-      resetQueryCopilotStates: () => {
-        set((state) => ({
-          ...state,
-          generatedQuery: "",
-          likeQuery: false,
-          userPrompt: "",
-          showFeedbackModal: false,
-          hideFeedbackModalForLikedQueries: false,
-          correlationId: "",
-          query: "SELECT * FROM c",
-          selectedQuery: "",
-          isGeneratingQuery: false,
-          isGeneratingExplanation: false,
-          isExecuting: false,
-          dislikeQuery: undefined,
-          showCallout: false,
-          showSamplePrompts: false,
-          queryIterator: undefined,
-          queryResults: undefined,
-          errorMessage: "",
-          isSamplePromptsOpen: false,
-          showDeletePopup: false,
-          showFeedbackBar: false,
-          showCopyPopup: false,
-          showErrorMessageBar: false,
-          showInvalidQueryMessageBar: false,
-          generatedQueryComments: "",
-          wasCopilotUsed: false,
-          showCopilotSidebar: false,
-          chatMessages: [],
-          shouldIncludeInMessages: true,
-          showExplanationBubble: false,
-          notebookServerInfo: {
-            notebookServerEndpoint: undefined,
-            authToken: undefined,
-            forwardingId: undefined,
-          },
-          containerStatus: {
-            status: undefined,
-            durationLeftInMinutes: undefined,
-            phoenixServerInfo: undefined,
-          },
-          isAllocatingContainer: false,
-        }));
-      },
-    })),
-  );
-  return <context.Provider value={useStore()}>{children}</context.Provider>;
-};
-
-export { CopilotProvider, useCopilotStore };
--- a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
@@ -1,606 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-console */
-import {
-  Callout,
-  CommandBarButton,
-  DefaultButton,
-  DirectionalHint,
-  IButtonStyles,
-  IconButton,
-  Image,
-  Link,
-  MessageBar,
-  MessageBarType,
-  Separator,
-  Spinner,
-  Stack,
-  TeachingBubble,
-  Text,
-  TextField,
-} from "@fluentui/react";
-import { useBoolean } from "@fluentui/react-hooks";
-import { HttpStatusCodes } from "Common/Constants";
-import { handleError } from "Common/ErrorHandlingUtils";
-import { createUri } from "Common/UrlUtility";
-import { WelcomeModal } from "Explorer/QueryCopilot/Modal/WelcomeModal";
-import { CopyPopup } from "Explorer/QueryCopilot/Popup/CopyPopup";
-import { DeletePopup } from "Explorer/QueryCopilot/Popup/DeletePopup";
-import {
-  SuggestedPrompt,
-  getSampleDatabaseSuggestedPrompts,
-  getSuggestedPrompts,
-} from "Explorer/QueryCopilot/QueryCopilotUtilities";
-import { SubmitFeedback, allocatePhoenixContainer } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
-import { GenerateSQLQueryResponse, QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
-import { SamplePrompts, SamplePromptsProps } from "Explorer/QueryCopilot/Shared/SamplePrompts/SamplePrompts";
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { userContext } from "UserContext";
-import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
-import React, { useRef, useState } from "react";
-import HintIcon from "../../../images/Hint.svg";
-import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
-import RecentIcon from "../../../images/Recent.svg";
-import errorIcon from "../../../images/close-black.svg";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { useTabs } from "../../hooks/useTabs";
-import { useCopilotStore } from "../QueryCopilot/QueryCopilotContext";
-import { useSelectedNode } from "../useSelectedNode";
-
-type QueryCopilotPromptProps = QueryCopilotProps & {
-  databaseId: string;
-  containerId: string;
-  toggleCopilot: (toggle: boolean) => void;
-};
-
-const promptStyles: IButtonStyles = {
-  root: { border: 0, selectors: { ":hover": { outline: "1px dashed #605e5c" } } },
-  label: {
-    fontWeight: 400,
-    textAlign: "left",
-    paddingLeft: 8,
-    overflow: "hidden",
-    whiteSpace: "nowrap",
-    textOverflow: "ellipsis",
-  },
-  textContainer: { overflow: "hidden" },
-};
-
-export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
-  explorer,
-  toggleCopilot,
-  databaseId,
-  containerId,
-}: QueryCopilotPromptProps): JSX.Element => {
-  const [copilotTeachingBubbleVisible, { toggle: toggleCopilotTeachingBubbleVisible }] = useBoolean(false);
-  const {
-    openFeedbackModal,
-    hideFeedbackModalForLikedQueries,
-    userPrompt,
-    setUserPrompt,
-    generatedQuery,
-    setGeneratedQuery,
-    query,
-    setQuery,
-    isGeneratingQuery,
-    setIsGeneratingQuery,
-    likeQuery,
-    setLikeQuery,
-    dislikeQuery,
-    setDislikeQuery,
-    showCallout,
-    setShowCallout,
-    isSamplePromptsOpen,
-    setIsSamplePromptsOpen,
-    showSamplePrompts,
-    setShowSamplePrompts,
-    showDeletePopup,
-    setShowDeletePopup,
-    showFeedbackBar,
-    setShowFeedbackBar,
-    showCopyPopup,
-    setshowCopyPopup,
-    showErrorMessageBar,
-    showInvalidQueryMessageBar,
-    setShowInvalidQueryMessageBar,
-    setShowErrorMessageBar,
-    setGeneratedQueryComments,
-    setQueryResults,
-    setErrorMessage,
-    errorMessage,
-  } = useCopilotStore();
-
-  const inputEdited = useRef(!!userPrompt);
-
-  const sampleProps: SamplePromptsProps = {
-    isSamplePromptsOpen: isSamplePromptsOpen,
-    setIsSamplePromptsOpen: setIsSamplePromptsOpen,
-    setTextBox: setUserPrompt,
-  };
-
-  const copyGeneratedCode = () => {
-    if (!query) {
-      return;
-    }
-    const queryElement = document.createElement("textarea");
-    queryElement.value = query;
-    document.body.appendChild(queryElement);
-    queryElement.select();
-    document.execCommand("copy");
-    document.body.removeChild(queryElement);
-
-    setshowCopyPopup(true);
-    setTimeout(() => {
-      setshowCopyPopup(false);
-    }, 6000);
-  };
-
-  const isSampleCopilotActive = useSelectedNode.getState().isQueryCopilotCollectionSelected();
-  const cachedHistoriesString = localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotHistories`);
-  const cachedHistories = cachedHistoriesString?.split("|");
-  const [histories, setHistories] = useState<string[]>(cachedHistories || []);
-  const suggestedPrompts: SuggestedPrompt[] = isSampleCopilotActive
-    ? getSampleDatabaseSuggestedPrompts()
-    : getSuggestedPrompts();
-  const [filteredHistories, setFilteredHistories] = useState<string[]>(histories);
-  const [filteredSuggestedPrompts, setFilteredSuggestedPrompts] = useState<SuggestedPrompt[]>(suggestedPrompts);
-
-  const handleUserPromptChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    inputEdited.current = true;
-    const { value } = event.target;
-    setUserPrompt(value);
-
-    // Filter history prompts
-    const filteredHistory = histories.filter((history) => history.toLowerCase().includes(value.toLowerCase()));
-    setFilteredHistories(filteredHistory);
-
-    // Filter suggested prompts
-    const filteredSuggested = suggestedPrompts.filter((prompt) =>
-      prompt.text.toLowerCase().includes(value.toLowerCase()),
-    );
-    setFilteredSuggestedPrompts(filteredSuggested);
-  };
-
-  const updateHistories = (): void => {
-    const formattedUserPrompt = userPrompt.replace(/\s+/g, " ").trim();
-    const existingHistories = histories.map((history) => history.replace(/\s+/g, " ").trim());
-
-    const updatedHistories = existingHistories.filter(
-      (history) => history.toLowerCase() !== formattedUserPrompt.toLowerCase(),
-    );
-    const newHistories = [formattedUserPrompt, ...updatedHistories.slice(0, 2)];
-
-    setHistories(newHistories);
-    localStorage.setItem(`${userContext.databaseAccount.id}-queryCopilotHistories`, newHistories.join("|"));
-  };
-
-  const resetMessageStates = (): void => {
-    setShowErrorMessageBar(false);
-    setShowInvalidQueryMessageBar(false);
-    setShowFeedbackBar(false);
-  };
-
-  const resetQueryResults = (): void => {
-    setQueryResults(null);
-    setErrorMessage("");
-  };
-
-  const generateSQLQuery = async (): Promise<void> => {
-    try {
-      resetMessageStates();
-      setIsGeneratingQuery(true);
-      setShowDeletePopup(false);
-      useTabs.getState().setIsTabExecuting(true);
-      useTabs.getState().setIsQueryErrorThrown(false);
-      const mode: string = isSampleCopilotActive ? "Sample" : "User";
-
-      await allocatePhoenixContainer({ explorer, databaseId, containerId, mode });
-
-      const payload = {
-        userPrompt: userPrompt,
-      };
-      useQueryCopilot.getState().refreshCorrelationId();
-      const serverInfo = useQueryCopilot.getState().notebookServerInfo;
-      const queryUri = userContext.features.disableCopilotPhoenixGateaway
-        ? createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery")
-        : createUri(serverInfo.notebookServerEndpoint, "public/generateSQLQuery");
-      const response = await fetch(queryUri, {
-        method: "POST",
-        headers: {
-          "content-type": "application/json",
-          "x-ms-correlationid": useQueryCopilot.getState().correlationId,
-          Authorization: `token ${useQueryCopilot.getState().notebookServerInfo.authToken}`,
-        },
-        body: JSON.stringify(payload),
-      });
-
-      const generateSQLQueryResponse: GenerateSQLQueryResponse = await response?.json();
-      if (response.ok) {
-        if (generateSQLQueryResponse?.sql !== "N/A") {
-          let query = `-- **Prompt:** ${userPrompt}\r\n`;
-          if (generateSQLQueryResponse.explanation) {
-            query += `-- **Explanation of query:** ${generateSQLQueryResponse.explanation}\r\n`;
-          }
-          query += generateSQLQueryResponse.sql;
-          setQuery(query);
-          setGeneratedQuery(generateSQLQueryResponse.sql);
-          setGeneratedQueryComments(generateSQLQueryResponse.explanation);
-          setShowFeedbackBar(true);
-          resetQueryResults();
-          TelemetryProcessor.traceSuccess(Action.QueryGenerationFromCopilotPrompt, {
-            databaseName: databaseId,
-            collectionId: containerId,
-            copilotLatency:
-              Date.parse(generateSQLQueryResponse?.generateEnd) - Date.parse(generateSQLQueryResponse?.generateStart),
-            responseCode: response.status,
-          });
-        } else {
-          setShowInvalidQueryMessageBar(true);
-          TelemetryProcessor.traceFailure(Action.QueryGenerationFromCopilotPrompt, {
-            databaseName: databaseId,
-            collectionId: containerId,
-            responseCode: response.status,
-          });
-        }
-      } else if (response?.status === HttpStatusCodes.TooManyRequests) {
-        handleError(JSON.stringify(generateSQLQueryResponse), "copilotTooManyRequestError");
-        useTabs.getState().setIsQueryErrorThrown(true);
-        setShowErrorMessageBar(true);
-        setErrorMessage("Ratelimit exceeded 5 per 1 minute. Please try again after sometime");
-        TelemetryProcessor.traceFailure(Action.QueryGenerationFromCopilotPrompt, {
-          databaseName: databaseId,
-          collectionId: containerId,
-          responseCode: response.status,
-        });
-      } else {
-        handleError(JSON.stringify(generateSQLQueryResponse), "copilotInternalServerError");
-        useTabs.getState().setIsQueryErrorThrown(true);
-        setShowErrorMessageBar(true);
-        TelemetryProcessor.traceFailure(Action.QueryGenerationFromCopilotPrompt, {
-          databaseName: databaseId,
-          collectionId: containerId,
-          responseCode: response.status,
-        });
-      }
-    } catch (error) {
-      handleError(error, "executeNaturalLanguageQuery");
-      useTabs.getState().setIsQueryErrorThrown(true);
-      setShowErrorMessageBar(true);
-      throw error;
-    } finally {
-      setIsGeneratingQuery(false);
-      useTabs.getState().setIsTabExecuting(false);
-    }
-  };
-
-  const showTeachingBubble = (): void => {
-    if (!inputEdited.current) {
-      setTimeout(() => {
-        if (!useQueryCopilot.getState().showWelcomeModal && !userPrompt && !inputEdited.current) {
-          toggleCopilotTeachingBubbleVisible();
-          inputEdited.current = true;
-        }
-      }, 30000);
-    }
-  };
-
-  const clearFeedback = () => {
-    resetButtonState();
-    resetQueryResults();
-  };
-
-  const resetButtonState = () => {
-    setDislikeQuery(false);
-    setLikeQuery(false);
-    setShowCallout(false);
-  };
-
-  const startGenerateQueryProcess = () => {
-    updateHistories();
-    generateSQLQuery();
-    resetButtonState();
-  };
-
-  React.useEffect(() => {
-    showTeachingBubble();
-    useQueryCopilot.subscribe(showTeachingBubble, (state: QueryCopilotState) => state.showWelcomeModal);
-    useTabs.getState().setIsQueryErrorThrown(false);
-  }, []);
-
-  return (
-    <Stack className="copilot-prompt-pane" styles={{ root: { backgroundColor: "#FAFAFA", padding: "16px 24px 0px" } }}>
-      <Stack horizontal>
-        <Image src={CopilotIcon} style={{ width: 24, height: 24 }} />
-        <Text style={{ marginLeft: 8, fontWeight: 600, fontSize: 16 }}>Copilot</Text>
-        <IconButton
-          iconProps={{ imageProps: { src: errorIcon } }}
-          onClick={() => {
-            toggleCopilot(false);
-            clearFeedback();
-            resetMessageStates();
-          }}
-          styles={{
-            root: {
-              marginLeft: "auto !important",
-            },
-          }}
-          ariaLabel="Close"
-        />
-      </Stack>
-      <Stack horizontal verticalAlign="center">
-        <TextField
-          id="naturalLanguageInput"
-          value={userPrompt}
-          onChange={handleUserPromptChange}
-          onClick={() => {
-            inputEdited.current = true;
-            setShowSamplePrompts(true);
-          }}
-          onKeyDown={(e) => {
-            if (e.key === "Enter" && userPrompt) {
-              inputEdited.current = true;
-              startGenerateQueryProcess();
-            }
-          }}
-          style={{ lineHeight: 30 }}
-          styles={{ root: { width: "95%" }, fieldGroup: { borderRadius: 6 } }}
-          disabled={isGeneratingQuery}
-          autoComplete="off"
-          placeholder="Ask a question in natural language and we’ll generate the query for you."
-        />
-        {copilotTeachingBubbleVisible && (
-          <TeachingBubble
-            calloutProps={{ directionalHint: DirectionalHint.bottomCenter }}
-            target="#naturalLanguageInput"
-            hasCloseButton={true}
-            closeButtonAriaLabel="Close"
-            onDismiss={toggleCopilotTeachingBubbleVisible}
-            hasSmallHeadline={true}
-            headline="Write a prompt"
-          >
-            Write a prompt here and Copilot will generate the query for you. You can also choose from our{" "}
-            <Link
-              onClick={() => {
-                setShowSamplePrompts(true);
-                toggleCopilotTeachingBubbleVisible();
-              }}
-              style={{ color: "white", fontWeight: 600 }}
-            >
-              sample prompts
-            </Link>{" "}
-            or write your own query
-          </TeachingBubble>
-        )}
-        <IconButton
-          iconProps={{ iconName: "Send" }}
-          disabled={isGeneratingQuery || !userPrompt.trim()}
-          style={{ marginLeft: 8 }}
-          onClick={() => startGenerateQueryProcess()}
-        />
-        {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
-        {showSamplePrompts && (
-          <Callout
-            styles={{ root: { minWidth: 400, maxWidth: "70vw" } }}
-            target="#naturalLanguageInput"
-            isBeakVisible={false}
-            onDismiss={() => setShowSamplePrompts(false)}
-            directionalHintFixed={true}
-            directionalHint={DirectionalHint.bottomLeftEdge}
-            alignTargetEdge={true}
-            gapSpace={4}
-          >
-            <Stack>
-              {filteredHistories?.length > 0 && (
-                <Stack>
-                  <Text
-                    style={{
-                      width: "100%",
-                      fontSize: 14,
-                      fontWeight: 600,
-                      color: "#0078D4",
-                      marginLeft: 16,
-                      padding: "4px 0",
-                    }}
-                  >
-                    Recent
-                  </Text>
-                  {filteredHistories.map((history, i) => (
-                    <DefaultButton
-                      key={i}
-                      onClick={() => {
-                        setUserPrompt(history);
-                        setShowSamplePrompts(false);
-                        inputEdited.current = true;
-                      }}
-                      onRenderIcon={() => <Image src={RecentIcon} styles={{ root: { overflow: "unset" } }} />}
-                      styles={promptStyles}
-                    >
-                      {history}
-                    </DefaultButton>
-                  ))}
-                </Stack>
-              )}
-              {filteredSuggestedPrompts?.length > 0 && (
-                <Stack>
-                  <Text
-                    style={{
-                      width: "100%",
-                      fontSize: 14,
-                      fontWeight: 600,
-                      color: "#0078D4",
-                      marginLeft: 16,
-                      padding: "4px 0",
-                    }}
-                  >
-                    Suggested Prompts
-                  </Text>
-                  {filteredSuggestedPrompts.map((prompt) => (
-                    <DefaultButton
-                      key={prompt.id}
-                      onClick={() => {
-                        setUserPrompt(prompt.text);
-                        setShowSamplePrompts(false);
-                        inputEdited.current = true;
-                      }}
-                      onRenderIcon={() => <Image src={HintIcon} />}
-                      styles={promptStyles}
-                    >
-                      {prompt.text}
-                    </DefaultButton>
-                  ))}
-                </Stack>
-              )}
-              {(filteredHistories?.length > 0 || filteredSuggestedPrompts?.length > 0) && (
-                <Stack>
-                  <Separator
-                    styles={{
-                      root: {
-                        selectors: { "::before": { background: "#E1DFDD" } },
-                        padding: 0,
-                      },
-                    }}
-                  />
-                  <Text
-                    style={{
-                      width: "100%",
-                      fontSize: 14,
-                      marginLeft: 16,
-                      padding: "4px 0",
-                    }}
-                  >
-                    Learn about{" "}
-                    <Link target="_blank" href="https://aka.ms/cdb-copilot-writing">
-                      writing effective prompts
-                    </Link>
-                  </Text>
-                </Stack>
-              )}
-            </Stack>
-          </Callout>
-        )}
-      </Stack>
-
-      <Stack style={{ margin: "8px 0" }}>
-        <Text style={{ fontSize: 12 }}>
-          AI-generated content can have mistakes. Make sure it&apos;s accurate and appropriate before using it.{" "}
-          <Link href="https://aka.ms/cdb-copilot-preview-terms" target="_blank">
-            Read preview terms
-          </Link>
-          {showErrorMessageBar && (
-            <MessageBar messageBarType={MessageBarType.error}>
-              {errorMessage ? errorMessage : "We ran into an error and were not able to execute query."}
-            </MessageBar>
-          )}
-          {showInvalidQueryMessageBar && (
-            <MessageBar
-              messageBarType={MessageBarType.info}
-              styles={{ root: { backgroundColor: "#F0F6FF" }, icon: { color: "#015CDA" } }}
-            >
-              We were unable to generate a query based upon the prompt provided. Please modify the prompt and try again.
-              For examples of how to write a good prompt, please read
-              <Link href="https://aka.ms/cdb-copilot-writing" target="_blank">
-                this article.
-              </Link>{" "}
-              Our content guidelines can be found
-              <Link href="https://aka.ms/cdb-query-copilot" target="_blank">
-                here.
-              </Link>
-            </MessageBar>
-          )}
-        </Text>
-      </Stack>
-
-      {showFeedbackBar && (
-        <Stack style={{ backgroundColor: "#FFF8F0", padding: "2px 8px" }} horizontal verticalAlign="center">
-          <Text style={{ fontWeight: 600, fontSize: 12 }}>Provide feedback on the query generated</Text>
-          {showCallout && !hideFeedbackModalForLikedQueries && (
-            <Callout
-              style={{ padding: 8 }}
-              target="#likeBtn"
-              onDismiss={() => {
-                setShowCallout(false);
-                SubmitFeedback({
-                  params: {
-                    generatedQuery: generatedQuery,
-                    likeQuery: likeQuery,
-                    description: "",
-                    userPrompt: userPrompt,
-                  },
-                  explorer,
-                  databaseId,
-                  containerId,
-                  mode: isSampleCopilotActive ? "Sample" : "User",
-                });
-              }}
-              directionalHint={DirectionalHint.topCenter}
-            >
-              <Text>
-                Thank you. Need to give{" "}
-                <Link
-                  onClick={() => {
-                    setShowCallout(false);
-                    openFeedbackModal(generatedQuery, true, userPrompt);
-                  }}
-                >
-                  more feedback?
-                </Link>
-              </Text>
-            </Callout>
-          )}
-          <IconButton
-            id="likeBtn"
-            style={{ marginLeft: 20 }}
-            iconProps={{ iconName: likeQuery === true ? "LikeSolid" : "Like" }}
-            onClick={() => {
-              setShowCallout(!likeQuery);
-              setLikeQuery(!likeQuery);
-              if (dislikeQuery) {
-                setDislikeQuery(!dislikeQuery);
-              }
-            }}
-          />
-          <IconButton
-            style={{ margin: "0 10px" }}
-            iconProps={{ iconName: dislikeQuery === true ? "DislikeSolid" : "Dislike" }}
-            onClick={() => {
-              if (!dislikeQuery) {
-                openFeedbackModal(generatedQuery, false, userPrompt);
-                setLikeQuery(false);
-              }
-              setDislikeQuery(!dislikeQuery);
-              setShowCallout(false);
-            }}
-          />
-          <Separator vertical style={{ color: "#EDEBE9" }} />
-          <CommandBarButton
-            onClick={copyGeneratedCode}
-            iconProps={{ iconName: "Copy" }}
-            style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
-          >
-            Copy query
-          </CommandBarButton>
-          <CommandBarButton
-            onClick={() => {
-              setShowDeletePopup(true);
-            }}
-            iconProps={{ iconName: "Delete" }}
-            style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
-          >
-            Delete query
-          </CommandBarButton>
-        </Stack>
-      )}
-      <WelcomeModal visible={useQueryCopilot.getState().showWelcomeModal} />
-      {isSamplePromptsOpen && <SamplePrompts sampleProps={sampleProps} />}
-      {query !== "" && query.trim().length !== 0 && (
-        <DeletePopup
-          showDeletePopup={showDeletePopup}
-          setShowDeletePopup={setShowDeletePopup}
-          setQuery={setQuery}
-          clearFeedback={clearFeedback}
-          showFeedbackBar={setShowFeedbackBar}
-        />
-      )}
-      <CopyPopup showCopyPopup={showCopyPopup} setShowCopyPopup={setshowCopyPopup} />
-    </Stack>
-  );
-};
--- a/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotTab.tsx
@@ -1,43 +1,230 @@
 /* eslint-disable no-console */
-import { Stack } from "@fluentui/react";
-import { QueryCopilotSampleContainerId, QueryCopilotSampleDatabaseId } from "Common/Constants";
+import {
+  Callout,
+  CommandBarButton,
+  DefaultButton,
+  DirectionalHint,
+  IButtonStyles,
+  IconButton,
+  Image,
+  Link,
+  Separator,
+  Spinner,
+  Stack,
+  TeachingBubble,
+  Text,
+  TextField,
+} from "@fluentui/react";
+import { useBoolean } from "@fluentui/react-hooks";
+import {
+  ContainerStatusType,
+  PoolIdType,
+  QueryCopilotSampleContainerSchema,
+  ShortenedQueryCopilotSampleContainerSchema,
+} from "Common/Constants";
+import { handleError } from "Common/ErrorHandlingUtils";
+import { createUri } from "Common/UrlUtility";
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { SaveQueryPane } from "Explorer/Panes/SaveQueryPane/SaveQueryPane";
-import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
-import { OnExecuteQueryClick } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
-import { QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
+import { WelcomeModal } from "Explorer/QueryCopilot/Modal/WelcomeModal";
+import { CopyPopup } from "Explorer/QueryCopilot/Popup/CopyPopup";
+import { DeletePopup } from "Explorer/QueryCopilot/Popup/DeletePopup";
+import { OnExecuteQueryClick, SubmitFeedback } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
+import { GenerateSQLQueryResponse, QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
 import { QueryCopilotResults } from "Explorer/QueryCopilot/Shared/QueryCopilotResults";
+import { SamplePrompts, SamplePromptsProps } from "Explorer/QueryCopilot/Shared/SamplePrompts/SamplePrompts";
 import { userContext } from "UserContext";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
-import { ReactTabKind, TabsState, useTabs } from "hooks/useTabs";
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import SplitterLayout from "react-splitter-layout";
-import QueryCommandIcon from "../../../images/CopilotCommand.svg";
 import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
+import HintIcon from "../../../images/Hint.svg";
+import CopilotIcon from "../../../images/QueryCopilotNewLogo.svg";
+import RecentIcon from "../../../images/Recent.svg";
+import XErrorMessage from "../../../images/X-errorMessage.svg";
 import SaveQueryIcon from "../../../images/save-cosmos.svg";
-import * as StringUtility from "../../Shared/StringUtility";
+import { useTabs } from "../../hooks/useTabs";
+
+interface SuggestedPrompt {
+  id: number;
+  text: string;
+}
+
+const promptStyles: IButtonStyles = {
+  root: { border: 0, selectors: { ":hover": { outline: "1px dashed #605e5c" } } },
+  label: { fontWeight: 400, textAlign: "left", paddingLeft: 8 },
+};

 export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: QueryCopilotProps): JSX.Element => {
-  const { query, setQuery, selectedQuery, setSelectedQuery, isGeneratingQuery } = useQueryCopilot();
+  const [copilotTeachingBubbleVisible, { toggle: toggleCopilotTeachingBubbleVisible }] = useBoolean(false);
+  const inputEdited = useRef(false);
+  const {
+    hideFeedbackModalForLikedQueries,
+    userPrompt,
+    setUserPrompt,
+    generatedQuery,
+    setGeneratedQuery,
+    query,
+    setQuery,
+    selectedQuery,
+    setSelectedQuery,
+    isGeneratingQuery,
+    setIsGeneratingQuery,
+    likeQuery,
+    setLikeQuery,
+    dislikeQuery,
+    setDislikeQuery,
+    showCallout,
+    setShowCallout,
+    showSamplePrompts,
+    setShowSamplePrompts,
+    isSamplePromptsOpen,
+    setIsSamplePromptsOpen,
+    showDeletePopup,
+    setShowDeletePopup,
+    showFeedbackBar,
+    setShowFeedbackBar,
+    showCopyPopup,
+    setshowCopyPopup,
+    showErrorMessageBar,
+    setShowErrorMessageBar,
+    setGeneratedQueryComments,
+  } = useQueryCopilot();

-  const cachedCopilotToggleStatus: string = localStorage.getItem(
-    `${userContext.databaseAccount?.id}-queryCopilotToggleStatus`,
-  );
-  const copilotInitialActive: boolean = cachedCopilotToggleStatus
-    ? StringUtility.toBoolean(cachedCopilotToggleStatus)
-    : true;
-  const [copilotActive, setCopilotActive] = useState<boolean>(copilotInitialActive);
-  const [tabActive, setTabActive] = useState<boolean>(true);
+  const sampleProps: SamplePromptsProps = {
+    isSamplePromptsOpen: isSamplePromptsOpen,
+    setIsSamplePromptsOpen: setIsSamplePromptsOpen,
+    setTextBox: setUserPrompt,
+  };
+
+  const copyGeneratedCode = () => {
+    if (!query) {
+      return;
+    }
+    const queryElement = document.createElement("textarea");
+    queryElement.value = query;
+    document.body.appendChild(queryElement);
+    queryElement.select();
+    document.execCommand("copy");
+    document.body.removeChild(queryElement);
+
+    setshowCopyPopup(true);
+    setTimeout(() => {
+      setshowCopyPopup(false);
+    }, 6000);
+  };
+
+  const cachedHistoriesString = localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotHistories`);
+  const cachedHistories = cachedHistoriesString?.split("|");
+  const [histories, setHistories] = useState<string[]>(cachedHistories || []);
+  const suggestedPrompts: SuggestedPrompt[] = [
+    { id: 1, text: 'Show all products that have the word "ultra" in the name or description' },
+    { id: 2, text: "What are all of the possible categories for the products, and their counts?" },
+    { id: 3, text: 'Show me all products that have been reviewed by someone with a username that contains "bob"' },
+  ];
+  const [filteredHistories, setFilteredHistories] = useState<string[]>(histories);
+  const [filteredSuggestedPrompts, setFilteredSuggestedPrompts] = useState<SuggestedPrompt[]>(suggestedPrompts);
+
+  const handleUserPromptChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    inputEdited.current = true;
+    const { value } = event.target;
+    setUserPrompt(value);
+
+    // Filter history prompts
+    const filteredHistory = histories.filter((history) => history.toLowerCase().includes(value.toLowerCase()));
+    setFilteredHistories(filteredHistory);
+
+    // Filter suggested prompts
+    const filteredSuggested = suggestedPrompts.filter((prompt) =>
+      prompt.text.toLowerCase().includes(value.toLowerCase()),
+    );
+    setFilteredSuggestedPrompts(filteredSuggested);
+  };
+
+  const updateHistories = (): void => {
+    const formattedUserPrompt = userPrompt.replace(/\s+/g, " ").trim();
+    const existingHistories = histories.map((history) => history.replace(/\s+/g, " ").trim());
+
+    const updatedHistories = existingHistories.filter(
+      (history) => history.toLowerCase() !== formattedUserPrompt.toLowerCase(),
+    );
+    const newHistories = [formattedUserPrompt, ...updatedHistories.slice(0, 2)];
+
+    setHistories(newHistories);
+    localStorage.setItem(`${userContext.databaseAccount.id}-queryCopilotHistories`, newHistories.join("|"));
+  };
+
+  const generateSQLQuery = async (): Promise<void> => {
+    try {
+      setIsGeneratingQuery(true);
+      setShowDeletePopup(false);
+      useTabs.getState().setIsTabExecuting(true);
+      useTabs.getState().setIsQueryErrorThrown(false);
+      if (
+        useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
+        !userContext.features.disableCopilotPhoenixGateaway
+      ) {
+        await explorer.allocateContainer(PoolIdType.QueryCopilot);
+      }
+      const payload = {
+        containerSchema: userContext.features.enableCopilotFullSchema
+          ? QueryCopilotSampleContainerSchema
+          : ShortenedQueryCopilotSampleContainerSchema,
+        userPrompt: userPrompt,
+      };
+      useQueryCopilot.getState().refreshCorrelationId();
+      const serverInfo = useQueryCopilot.getState().notebookServerInfo;
+      const queryUri = userContext.features.disableCopilotPhoenixGateaway
+        ? createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery")
+        : createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery");
+      const response = await fetch(queryUri, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          "x-ms-correlationid": useQueryCopilot.getState().correlationId,
+        },
+        body: JSON.stringify(payload),
+      });
+
+      const generateSQLQueryResponse: GenerateSQLQueryResponse = await response?.json();
+      if (response.ok) {
+        if (generateSQLQueryResponse?.sql) {
+          let query = `-- **Prompt:** ${userPrompt}\r\n`;
+          if (generateSQLQueryResponse.explanation) {
+            query += `-- **Explanation of query:** ${generateSQLQueryResponse.explanation}\r\n`;
+          }
+          query += generateSQLQueryResponse.sql;
+          setQuery(query);
+          setGeneratedQuery(generateSQLQueryResponse.sql);
+          setGeneratedQueryComments(generateSQLQueryResponse.explanation);
+          setShowErrorMessageBar(false);
+        }
+      } else {
+        handleError(JSON.stringify(generateSQLQueryResponse), "copilotInternalServerError");
+        useTabs.getState().setIsQueryErrorThrown(true);
+        setShowErrorMessageBar(true);
+      }
+    } catch (error) {
+      handleError(error, "executeNaturalLanguageQuery");
+      useTabs.getState().setIsQueryErrorThrown(true);
+      setShowErrorMessageBar(true);
+      throw error;
+    } finally {
+      setIsGeneratingQuery(false);
+      useTabs.getState().setIsTabExecuting(false);
+      setShowFeedbackBar(true);
+    }
+  };

  const getCommandbarButtons = (): CommandButtonComponentProps[] => {
    const executeQueryBtnLabel = selectedQuery ? "Execute Selection" : "Execute Query";
    const executeQueryBtn = {
      iconSrc: ExecuteQueryIcon,
      iconAlt: executeQueryBtnLabel,
-      onCommandClick: () => OnExecuteQueryClick(useQueryCopilot),
+      onCommandClick: () => OnExecuteQueryClick(),
      commandButtonLabel: executeQueryBtnLabel,
      ariaLabel: executeQueryBtnLabel,
      hasPopup: false,
@@ -55,55 +242,306 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
      disabled: true,
    };

-    const toggleCopilotButton = {
-      iconSrc: QueryCommandIcon,
-      iconAlt: "Copilot",
-      onCommandClick: () => {
-        toggleCopilot(true);
-      },
-      commandButtonLabel: "Copilot",
-      ariaLabel: "Copilot",
-      hasPopup: false,
-      disabled: copilotActive,
-    };
+    // Sample Prompts temporary disabled due current design
+    // const samplePromptsBtn = {
+    //   iconSrc: SamplePromptsIcon,
+    //   iconAlt: "Sample Prompts",
+    //   onCommandClick: () => setIsSamplePromptsOpen(true),
+    //   commandButtonLabel: "Sample Prompts",
+    //   ariaLabel: "Sample Prompts",
+    //   hasPopup: false,
+    // };

-    return [executeQueryBtn, saveQueryBtn, toggleCopilotButton];
+    return [executeQueryBtn, saveQueryBtn];
+  };
+  const showTeachingBubble = (): void => {
+    if (!inputEdited.current) {
+      setTimeout(() => {
+        if (!inputEdited.current) {
+          toggleCopilotTeachingBubbleVisible();
+          inputEdited.current = true;
+        }
+      }, 30000);
+    }
+  };
+
+  const resetButtonState = () => {
+    setDislikeQuery(false);
+    setLikeQuery(false);
+    setShowCallout(false);
+  };
+
+  const startGenerateQueryProcess = () => {
+    updateHistories();
+    generateSQLQuery();
+    resetButtonState();
  };

  React.useEffect(() => {
    useCommandBar.getState().setContextButtons(getCommandbarButtons());
-  }, [query, selectedQuery, copilotActive]);
+  }, [query, selectedQuery]);

  React.useEffect(() => {
-    return () => {
-      useTabs.subscribe((state: TabsState) => {
-        if (state.activeReactTab === ReactTabKind.QueryCopilot) {
-          setTabActive(true);
-        } else {
-          setTabActive(false);
-        }
-      });
-    };
+    showTeachingBubble();
+    useTabs.getState().setIsQueryErrorThrown(false);
  }, []);

-  const toggleCopilot = (toggle: boolean) => {
-    setCopilotActive(toggle);
-    localStorage.setItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`, toggle.toString());
-  };
-
  return (
-    <Stack className="tab-pane" style={{ width: "100%" }}>
+    <Stack className="tab-pane" style={{ padding: 24, width: "100%" }}>
      <div style={isGeneratingQuery ? { height: "100%" } : { overflowY: "auto", height: "100%" }}>
-        {tabActive && copilotActive && (
-          <QueryCopilotPromptbar
-            explorer={explorer}
-            toggleCopilot={toggleCopilot}
-            databaseId={QueryCopilotSampleDatabaseId}
-            containerId={QueryCopilotSampleContainerId}
-          ></QueryCopilotPromptbar>
+        <Stack horizontal verticalAlign="center">
+          <Image src={CopilotIcon} />
+          <Text style={{ marginLeft: 8, fontWeight: 600, fontSize: 16 }}>Copilot</Text>
+        </Stack>
+        <Stack horizontal verticalAlign="center" style={{ marginTop: 16, width: "100%", position: "relative" }}>
+          <TextField
+            id="naturalLanguageInput"
+            value={userPrompt}
+            onChange={handleUserPromptChange}
+            onClick={() => {
+              inputEdited.current = true;
+              setShowSamplePrompts(true);
+            }}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                inputEdited.current = true;
+                startGenerateQueryProcess();
+              }
+            }}
+            style={{ lineHeight: 30 }}
+            styles={{ root: { width: "95%" } }}
+            disabled={isGeneratingQuery}
+            autoComplete="off"
+          />
+          {copilotTeachingBubbleVisible && (
+            <TeachingBubble
+              calloutProps={{ directionalHint: DirectionalHint.bottomCenter }}
+              target="#naturalLanguageInput"
+              hasCloseButton={true}
+              closeButtonAriaLabel="Close"
+              onDismiss={toggleCopilotTeachingBubbleVisible}
+              hasSmallHeadline={true}
+              headline="Write a prompt"
+            >
+              Write a prompt here and Copilot will generate the query for you. You can also choose from our{" "}
+              <Link
+                onClick={() => {
+                  setShowSamplePrompts(true);
+                  toggleCopilotTeachingBubbleVisible();
+                }}
+                style={{ color: "white", fontWeight: 600 }}
+              >
+                sample prompts
+              </Link>{" "}
+              or write your own query
+            </TeachingBubble>
+          )}
+          <IconButton
+            iconProps={{ iconName: "Send" }}
+            disabled={isGeneratingQuery || !userPrompt.trim()}
+            style={{ marginLeft: 8 }}
+            onClick={() => startGenerateQueryProcess()}
+          />
+          {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
+          {showSamplePrompts && (
+            <Callout
+              styles={{ root: { minWidth: 400 } }}
+              target="#naturalLanguageInput"
+              isBeakVisible={false}
+              onDismiss={() => setShowSamplePrompts(false)}
+              directionalHintFixed={true}
+              directionalHint={DirectionalHint.bottomLeftEdge}
+              alignTargetEdge={true}
+              gapSpace={4}
+            >
+              <Stack>
+                {filteredHistories?.length > 0 && (
+                  <Stack>
+                    <Text
+                      style={{
+                        width: "100%",
+                        fontSize: 14,
+                        fontWeight: 600,
+                        color: "#0078D4",
+                        marginLeft: 16,
+                        padding: "4px 0",
+                      }}
+                    >
+                      Recent
+                    </Text>
+                    {filteredHistories.map((history, i) => (
+                      <DefaultButton
+                        key={i}
+                        onClick={() => {
+                          setUserPrompt(history);
+                          setShowSamplePrompts(false);
+                          inputEdited.current = true;
+                        }}
+                        onRenderIcon={() => <Image src={RecentIcon} />}
+                        styles={promptStyles}
+                      >
+                        {history}
+                      </DefaultButton>
+                    ))}
+                  </Stack>
+                )}
+                {filteredSuggestedPrompts?.length > 0 && (
+                  <Stack>
+                    <Text
+                      style={{
+                        width: "100%",
+                        fontSize: 14,
+                        fontWeight: 600,
+                        color: "#0078D4",
+                        marginLeft: 16,
+                        padding: "4px 0",
+                      }}
+                    >
+                      Suggested Prompts
+                    </Text>
+                    {filteredSuggestedPrompts.map((prompt) => (
+                      <DefaultButton
+                        key={prompt.id}
+                        onClick={() => {
+                          setUserPrompt(prompt.text);
+                          setShowSamplePrompts(false);
+                          inputEdited.current = true;
+                        }}
+                        onRenderIcon={() => <Image src={HintIcon} />}
+                        styles={promptStyles}
+                      >
+                        {prompt.text}
+                      </DefaultButton>
+                    ))}
+                  </Stack>
+                )}
+                {(filteredHistories?.length > 0 || filteredSuggestedPrompts?.length > 0) && (
+                  <Stack>
+                    <Separator
+                      styles={{
+                        root: {
+                          selectors: { "::before": { background: "#E1DFDD" } },
+                          padding: 0,
+                        },
+                      }}
+                    />
+                    <Text
+                      style={{
+                        width: "100%",
+                        fontSize: 14,
+                        marginLeft: 16,
+                        padding: "4px 0",
+                      }}
+                    >
+                      Learn about{" "}
+                      <Link target="_blank" href="https://aka.ms/cdb-copilot-writing">
+                        writing effective prompts
+                      </Link>
+                    </Text>
+                  </Stack>
+                )}
+              </Stack>
+            </Callout>
+          )}
+        </Stack>
+
+        <Stack style={{ marginTop: 8, marginBottom: 24 }}>
+          <Text style={{ fontSize: 12 }}>
+            AI-generated content can have mistakes. Make sure it&apos;s accurate and appropriate before using it.{" "}
+            <Link href="https://aka.ms/cdb-copilot-preview-terms" target="_blank">
+              Read preview terms
+            </Link>
+            {showErrorMessageBar && (
+              <Stack style={{ backgroundColor: "#FEF0F1", padding: "4px 8px" }} horizontal verticalAlign="center">
+                <Image src={XErrorMessage} style={{ marginRight: "8px" }} />
+                <Text style={{ fontSize: 12 }}>
+                  We ran into an error and were not able to execute query. Please try again after sometime
+                </Text>
+              </Stack>
+            )}
+          </Text>
+        </Stack>
+
+        {showFeedbackBar && (
+          <Stack style={{ backgroundColor: "#FFF8F0", padding: "2px 8px" }} horizontal verticalAlign="center">
+            <Text style={{ fontWeight: 600, fontSize: 12 }}>Provide feedback on the query generated</Text>
+            {showCallout && !hideFeedbackModalForLikedQueries && (
+              <Callout
+                style={{ padding: 8 }}
+                target="#likeBtn"
+                onDismiss={() => {
+                  setShowCallout(false);
+                  SubmitFeedback({
+                    params: {
+                      generatedQuery: generatedQuery,
+                      likeQuery: likeQuery,
+                      description: "",
+                      userPrompt: userPrompt,
+                    },
+                    explorer: explorer,
+                  });
+                }}
+                directionalHint={DirectionalHint.topCenter}
+              >
+                <Text>
+                  Thank you. Need to give{" "}
+                  <Link
+                    onClick={() => {
+                      setShowCallout(false);
+                      useQueryCopilot.getState().openFeedbackModal(generatedQuery, true, userPrompt);
+                    }}
+                  >
+                    more feedback?
+                  </Link>
+                </Text>
+              </Callout>
+            )}
+            <IconButton
+              id="likeBtn"
+              style={{ marginLeft: 20 }}
+              iconProps={{ iconName: likeQuery === true ? "LikeSolid" : "Like" }}
+              onClick={() => {
+                setShowCallout(!likeQuery);
+                setLikeQuery(!likeQuery);
+                if (dislikeQuery) {
+                  setDislikeQuery(!dislikeQuery);
+                }
+              }}
+            />
+            <IconButton
+              style={{ margin: "0 10px" }}
+              iconProps={{ iconName: dislikeQuery === true ? "DislikeSolid" : "Dislike" }}
+              onClick={() => {
+                if (!dislikeQuery) {
+                  useQueryCopilot.getState().openFeedbackModal(generatedQuery, false, userPrompt);
+                  setLikeQuery(false);
+                }
+                setDislikeQuery(!dislikeQuery);
+                setShowCallout(false);
+              }}
+            />
+            <Separator vertical style={{ color: "#EDEBE9" }} />
+            <CommandBarButton
+              onClick={copyGeneratedCode}
+              iconProps={{ iconName: "Copy" }}
+              style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
+            >
+              Copy code
+            </CommandBarButton>
+            <CommandBarButton
+              onClick={() => {
+                setShowDeletePopup(true);
+              }}
+              iconProps={{ iconName: "Delete" }}
+              style={{ margin: "0 10px", backgroundColor: "#FFF8F0", transition: "background-color 0.3s ease" }}
+            >
+              Delete code
+            </CommandBarButton>
+          </Stack>
        )}
+
        <Stack className="tabPaneContentContainer">
-          <SplitterLayout percentage={true} vertical={true} primaryIndex={0} primaryMinSize={30} secondaryMinSize={70}>
+          <SplitterLayout vertical={true} primaryIndex={0} primaryMinSize={100} secondaryMinSize={200}>
            <EditorReact
              language={"sql"}
              content={query}
@@ -117,6 +555,18 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
            <QueryCopilotResults />
          </SplitterLayout>
        </Stack>
+        <WelcomeModal visible={localStorage.getItem("hideWelcomeModal") !== "true"} />
+        {isSamplePromptsOpen && <SamplePrompts sampleProps={sampleProps} />}
+        {query !== "" && query.trim().length !== 0 && (
+          <DeletePopup
+            showDeletePopup={showDeletePopup}
+            setShowDeletePopup={setShowDeletePopup}
+            setQuery={setQuery}
+            clearFeedback={resetButtonState}
+            showFeedbackBar={setShowFeedbackBar}
+          />
+        )}
+        <CopyPopup showCopyPopup={showCopyPopup} setShowCopyPopup={setshowCopyPopup} />
      </div>
    </Stack>
  );
--- a/src/Explorer/QueryCopilot/QueryCopilotUtilities.ts
+++ b/src/Explorer/QueryCopilot/QueryCopilotUtilities.ts
@@ -7,11 +7,6 @@ import { getCommonQueryOptions } from "Common/dataAccess/queryDocuments";
 import DocumentId from "Explorer/Tree/DocumentId";
 import { logConsoleProgress } from "Utils/NotificationConsoleUtils";

-export interface SuggestedPrompt {
-  id: number;
-  text: string;
-}
-
 export const querySampleDocuments = (query: string, options: FeedOptions): QueryIterator<ItemDefinition & Resource> => {
  options = getCommonQueryOptions(options);
  return sampleDataClient()
@@ -38,19 +33,3 @@ export const readSampleDocument = async (documentId: DocumentId): Promise<Item>
    clearMessage();
  }
 };
-
-export const getSampleDatabaseSuggestedPrompts = (): SuggestedPrompt[] => {
-  return [
-    { id: 1, text: 'Show all products that have the word "ultra" in the name or description' },
-    { id: 2, text: "What are all of the possible categories for the products, and their counts?" },
-    { id: 3, text: 'Show me all products that have been reviewed by someone with a username that contains "bob"' },
-  ];
-};
-
-export const getSuggestedPrompts = (): SuggestedPrompt[] => {
-  return [
-    { id: 1, text: "Show the first 10 items" },
-    { id: 2, text: 'Count all the items in my data as "numItems"' },
-    { id: 3, text: "Find the oldest item added to my collection" },
-  ];
-};
--- a/src/Explorer/QueryCopilot/Shared/QueryCopilotClient.test.ts
+++ b/src/Explorer/QueryCopilot/Shared/QueryCopilotClient.test.ts
@@ -1,3 +1,4 @@
+import { QueryCopilotSampleContainerSchema, ShortenedQueryCopilotSampleContainerSchema } from "Common/Constants";
 import { handleError } from "Common/ErrorHandlingUtils";
 import { createUri } from "Common/UrlUtility";
 import Explorer from "Explorer/Explorer";
@@ -36,6 +37,9 @@ describe("Query Copilot Client", () => {
      userPrompt: "UserPrompt",
      description: "Description",
      contact: "Contact",
+      containerSchema: userContext.features.enableCopilotFullSchema
+        ? QueryCopilotSampleContainerSchema
+        : ShortenedQueryCopilotSampleContainerSchema,
    };

    const mockStore = useQueryCopilot.getState();
@@ -48,16 +52,13 @@ describe("Query Copilot Client", () => {

    const feedbackUri = userContext.features.disableCopilotPhoenixGateaway
      ? createUri("https://copilotorchestrater.azurewebsites.net/", "feedback")
-      : createUri(useQueryCopilot.getState().notebookServerInfo.notebookServerEndpoint, "public/feedback");
+      : createUri(useQueryCopilot.getState().notebookServerInfo.notebookServerEndpoint, "feedback");

    it("should call fetch with the payload with like", async () => {
      const mockFetch = jest.fn().mockResolvedValueOnce({});

      globalThis.fetch = mockFetch;
      await SubmitFeedback({
-        databaseId: "test",
-        containerId: "test",
-        mode: "User",
        params: {
          likeQuery: true,
          generatedQuery: "GeneratedQuery",
@@ -90,9 +91,6 @@ describe("Query Copilot Client", () => {
      globalThis.fetch = mockFetch;

      await SubmitFeedback({
-        databaseId: "test",
-        containerId: "test",
-        mode: "User",
        params: {
          likeQuery: false,
          generatedQuery: "GeneratedQuery",
@@ -110,7 +108,6 @@ describe("Query Copilot Client", () => {
          headers: {
            "content-type": "application/json",
            "x-ms-correlationid": "mocked-correlation-id",
-            Authorization: "token mocked-token",
          },
        }),
      );
@@ -123,9 +120,6 @@ describe("Query Copilot Client", () => {
      globalThis.fetch = jest.fn().mockRejectedValueOnce(new Error("Mock error"));

      await SubmitFeedback({
-        databaseId: "test",
-        containerId: "test",
-        mode: "User",
        params: {
          likeQuery: true,
          generatedQuery: "GeneratedQuery",
--- a/src/Explorer/QueryCopilot/Shared/QueryCopilotClient.ts
+++ b/src/Explorer/QueryCopilot/Shared/QueryCopilotClient.ts
@@ -1,191 +1,26 @@
 import { FeedOptions } from "@azure/cosmos";
 import {
-  Areas,
-  ConnectionStatusType,
  ContainerStatusType,
-  HttpStatusCodes,
  PoolIdType,
  QueryCopilotSampleContainerId,
  QueryCopilotSampleContainerSchema,
  ShortenedQueryCopilotSampleContainerSchema,
 } from "Common/Constants";
-import { getErrorMessage, getErrorStack, handleError } from "Common/ErrorHandlingUtils";
+import { getErrorMessage, handleError } from "Common/ErrorHandlingUtils";
 import { shouldEnableCrossPartitionKey } from "Common/HeadersUtility";
 import { MinimalQueryIterator } from "Common/IteratorUtilities";
 import { createUri } from "Common/UrlUtility";
 import { queryDocumentsPage } from "Common/dataAccess/queryDocumentsPage";
-import { configContext } from "ConfigContext";
-import {
-  ContainerConnectionInfo,
-  CopilotEnabledConfiguration,
-  FeatureRegistration,
-  IProvisionData,
-} from "Contracts/DataModels";
-import { AuthorizationTokenHeaderMetadata, QueryResults } from "Contracts/ViewModels";
-import { useDialog } from "Explorer/Controls/Dialog";
+import { QueryResults } from "Contracts/ViewModels";
 import Explorer from "Explorer/Explorer";
 import { querySampleDocuments } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { FeedbackParams, GenerateSQLQueryResponse } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceFailure, traceStart, traceSuccess } from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
-import { getAuthorizationHeader } from "Utils/AuthorizationUtils";
 import { queryPagesUntilContentPresent } from "Utils/QueryUtils";
-import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useTabs } from "hooks/useTabs";
-import * as StringUtility from "../../../Shared/StringUtility";
-
-async function fetchWithTimeout(
-  url: string,
-  headers: {
-    [x: string]: string;
-  },
-) {
-  const timeout = 10000;
-  const options = { timeout };
-
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeout);
-
-  const response = await window.fetch(url, {
-    headers,
-    ...options,
-    signal: controller.signal,
-  });
-  clearTimeout(id);
-
-  return response;
-}
-
-export const isCopilotFeatureRegistered = async (subscriptionId: string): Promise<boolean> => {
-  const api_version = "2021-07-01";
-  const url = `${configContext.ARM_ENDPOINT}/subscriptions/${subscriptionId}/providers/Microsoft.Features/featureProviders/Microsoft.DocumentDB/subscriptionFeatureRegistrations/MicrosoftCopilotForAzureInCDB?api-version=${api_version}`;
-  const authorizationHeader: AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
-  const headers = { [authorizationHeader.header]: authorizationHeader.token };
-
-  let response;
-
-  try {
-    response = await fetchWithTimeout(url, headers);
-  } catch (error) {
-    return false;
-  }
-
-  if (!response?.ok) {
-    return false;
-  }
-
-  const featureRegistration = (await response?.json()) as FeatureRegistration;
-  return featureRegistration?.properties?.state === "Registered";
-};
-
-export const getCopilotEnabled = async (): Promise<boolean> => {
-  const url = `${configContext.BACKEND_ENDPOINT}/api/portalsettings/querycopilot`;
-  const authorizationHeader: AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
-  const headers = { [authorizationHeader.header]: authorizationHeader.token };
-
-  let response;
-
-  try {
-    response = await fetchWithTimeout(url, headers);
-  } catch (error) {
-    return false;
-  }
-
-  if (!response?.ok) {
-    return false;
-  }
-
-  const copilotPortalConfiguration = (await response?.json()) as CopilotEnabledConfiguration;
-  return copilotPortalConfiguration?.isEnabled;
-};
-
-export const allocatePhoenixContainer = async ({
-  explorer,
-  databaseId,
-  containerId,
-  mode,
-}: {
-  explorer: Explorer;
-  databaseId: string;
-  containerId: string;
-  mode: string;
-}): Promise<void> => {
-  try {
-    if (
-      useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
-      !userContext.features.disableCopilotPhoenixGateaway
-    ) {
-      await explorer.allocateContainer(PoolIdType.QueryCopilot, mode);
-    } else {
-      const currentAllocatedSchemaInfo = useQueryCopilot.getState().schemaAllocationInfo;
-      if (
-        currentAllocatedSchemaInfo.databaseId !== databaseId ||
-        currentAllocatedSchemaInfo.containerId !== containerId
-      ) {
-        await resetPhoenixContainerSchema({ explorer, databaseId, containerId, mode });
-      }
-    }
-    useQueryCopilot.getState().setSchemaAllocationInfo({
-      databaseId,
-      containerId,
-    });
-  } catch (error) {
-    traceFailure(Action.PhoenixConnection, {
-      dataExplorerArea: Areas.Copilot,
-      status: error.status,
-      error: getErrorMessage(error),
-      errorStack: getErrorStack(error),
-    });
-    useQueryCopilot.getState().resetContainerConnection();
-    if (error?.status === HttpStatusCodes.Forbidden && error.message) {
-      useDialog.getState().showOkModalDialog("Connection Failed", `${error.message}`);
-    } else {
-      useDialog
-        .getState()
-        .showOkModalDialog(
-          "Connection Failed",
-          "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket.",
-        );
-    }
-  } finally {
-    useTabs.getState().setIsTabExecuting(false);
-  }
-};
-
-export const resetPhoenixContainerSchema = async ({
-  explorer,
-  databaseId,
-  containerId,
-  mode,
-}: {
-  explorer: Explorer;
-  databaseId: string;
-  containerId: string;
-  mode: string;
-}): Promise<void> => {
-  try {
-    const provisionData: IProvisionData = {
-      poolId: PoolIdType.QueryCopilot,
-      databaseId: databaseId,
-      containerId: containerId,
-      mode: mode,
-    };
-    const connectionInfo = await explorer.phoenixClient.allocateContainer(provisionData);
-    const connectionStatus: ContainerConnectionInfo = {
-      status: ConnectionStatusType.Connecting,
-    };
-    await explorer.setNotebookInfo(false, connectionInfo, connectionStatus);
-  } catch (error) {
-    traceFailure(Action.PhoenixConnection, {
-      dataExplorerArea: Areas.Copilot,
-      status: error.status,
-      error: getErrorMessage(error),
-      errorStack: getErrorStack(error),
-    });
-    throw error;
-  }
-};

 export const SendQueryRequest = async ({
  userPrompt,
@@ -215,7 +50,7 @@ export const SendQueryRequest = async ({

      const queryUri = userContext.features.disableCopilotPhoenixGateaway
        ? createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery")
-        : createUri(serverInfo.notebookServerEndpoint, "public/generateSQLQuery");
+        : createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery");

      const payload = {
        containerSchema: userContext.features.enableCopilotFullSchema
@@ -270,19 +105,16 @@ export const SendQueryRequest = async ({
 export const SubmitFeedback = async ({
  params,
  explorer,
-  databaseId,
-  containerId,
-  mode,
 }: {
  params: FeedbackParams;
  explorer: Explorer;
-  databaseId: string;
-  containerId: string;
-  mode: string;
 }): Promise<void> => {
  try {
    const { likeQuery, generatedQuery, userPrompt, description, contact } = params;
    const payload = {
+      containerSchema: userContext.features.enableCopilotFullSchema
+        ? QueryCopilotSampleContainerSchema
+        : ShortenedQueryCopilotSampleContainerSchema,
      like: likeQuery ? "like" : "dislike",
      generatedSql: generatedQuery,
      userPrompt,
@@ -293,18 +125,17 @@ export const SubmitFeedback = async ({
      useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
      !userContext.features.disableCopilotPhoenixGateaway
    ) {
-      await allocatePhoenixContainer({ explorer, databaseId, containerId, mode });
+      await explorer.allocateContainer(PoolIdType.QueryCopilot);
    }
    const serverInfo = useQueryCopilot.getState().notebookServerInfo;
    const feedbackUri = userContext.features.disableCopilotPhoenixGateaway
      ? createUri("https://copilotorchestrater.azurewebsites.net/", "feedback")
-      : createUri(serverInfo.notebookServerEndpoint, "public/feedback");
+      : createUri(serverInfo.notebookServerEndpoint, "feedback");
    await fetch(feedbackUri, {
      method: "POST",
      headers: {
        "content-type": "application/json",
        "x-ms-correlationid": useQueryCopilot.getState().correlationId,
-        Authorization: `token ${useQueryCopilot.getState().notebookServerInfo.authToken}`,
      },
      body: JSON.stringify(payload),
    });
@@ -313,7 +144,7 @@ export const SubmitFeedback = async ({
  }
 };

-export const OnExecuteQueryClick = async (useQueryCopilot: Partial<QueryCopilotState>): Promise<void> => {
+export const OnExecuteQueryClick = async (): Promise<void> => {
  traceStart(Action.ExecuteQueryGeneratedFromQueryCopilot, {
    correlationId: useQueryCopilot.getState().correlationId,
    userPrompt: useQueryCopilot.getState().userPrompt,
@@ -328,14 +159,13 @@ export const OnExecuteQueryClick = async (useQueryCopilot: Partial<QueryCopilotS
  useQueryCopilot.getState().setQueryIterator(queryIterator);

  setTimeout(async () => {
-    await QueryDocumentsPerPage(0, queryIterator, useQueryCopilot);
+    await QueryDocumentsPerPage(0, queryIterator);
  }, 100);
 };

 export const QueryDocumentsPerPage = async (
  firstItemIndex: number,
  queryIterator: MinimalQueryIterator,
-  useQueryCopilot: Partial<QueryCopilotState>,
 ): Promise<void> => {
  try {
    useQueryCopilot.getState().setIsExecuting(true);
@@ -354,20 +184,15 @@ export const QueryDocumentsPerPage = async (
      correlationId: useQueryCopilot.getState().correlationId,
    });
  } catch (error) {
-    const isCopilotActive = StringUtility.toBoolean(
-      localStorage.getItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`),
-    );
    const errorMessage = getErrorMessage(error);
    traceFailure(Action.ExecuteQueryGeneratedFromQueryCopilot, {
      correlationId: useQueryCopilot.getState().correlationId,
      errorMessage: errorMessage,
    });
+    useQueryCopilot.getState().setErrorMessage(errorMessage);
    handleError(errorMessage, "executeQueryCopilotTab");
    useTabs.getState().setIsQueryErrorThrown(true);
-    if (isCopilotActive) {
-      useQueryCopilot.getState().setErrorMessage(errorMessage);
-      useQueryCopilot.getState().setShowErrorMessageBar(true);
-    }
+    useQueryCopilot.getState().setShowErrorMessageBar(true);
  } finally {
    useQueryCopilot.getState().setIsExecuting(false);
    useTabs.getState().setIsTabExecuting(false);
--- a/src/Explorer/QueryCopilot/Shared/QueryCopilotInterfaces.ts
+++ b/src/Explorer/QueryCopilot/Shared/QueryCopilotInterfaces.ts
@@ -32,8 +32,3 @@ export interface FeedbackParams {
 export interface QueryCopilotProps {
  explorer: Explorer;
 }
-
-export interface CopilotSchemaAllocationInfo {
-  databaseId: string;
-  containerId: string;
-}
--- a/src/Explorer/QueryCopilot/Shared/QueryCopilotResults.tsx
+++ b/src/Explorer/QueryCopilot/Shared/QueryCopilotResults.tsx
@@ -12,7 +12,7 @@ export const QueryCopilotResults: React.FC = (): JSX.Element => {
      queryResults={useQueryCopilot.getState().queryResults}
      isExecuting={useQueryCopilot.getState().isExecuting}
      executeQueryDocumentsPage={(firstItemIndex: number) =>
-        QueryDocumentsPerPage(firstItemIndex, useQueryCopilot.getState().queryIterator, useQueryCopilot)
+        QueryDocumentsPerPage(firstItemIndex, useQueryCopilot.getState().queryIterator)
      }
    />
  );
--- a/src/Explorer/QueryCopilot/snapshots/QueryCopilotTab.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/snapshots/QueryCopilotTab.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
  className="tab-pane"
  style={
    Object {
+      "padding": 24,
      "width": "100%",
    }
  }
@@ -17,39 +18,97 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
      }
    }
  >
-    <QueryCopilotPromptbar
-      containerId="SampleContainer"
-      databaseId="CopilotSampleDb"
-      explorer={
-        Explorer {
-          "_isInitializingNotebooks": false,
-          "_resetNotebookWorkspace": [Function],
-          "isFixedCollectionWithSharedThroughputSupported": [Function],
-          "isTabsContentExpanded": [Function],
-          "onRefreshDatabasesKeyPress": [Function],
-          "onRefreshResourcesClick": [Function],
-          "phoenixClient": PhoenixClient {
-            "armResourceId": undefined,
-            "retryOptions": Object {
-              "maxTimeout": 5000,
-              "minTimeout": 5000,
-              "retries": 3,
-            },
-          },
-          "provideFeedbackEmail": [Function],
-          "queriesClient": QueriesClient {
-            "container": [Circular],
-          },
-          "refreshNotebookList": [Function],
-          "resourceTree": ResourceTreeAdapter {
-            "container": [Circular],
-            "copyNotebook": [Function],
-            "parameters": [Function],
-          },
+    <Stack
+      horizontal={true}
+      verticalAlign="center"
+    >
+      <Image
+        src={Object {}}
+      />
+      <Text
+        style={
+          Object {
+            "fontSize": 16,
+            "fontWeight": 600,
+            "marginLeft": 8,
+          }
+        }
+      >
+        Copilot
+      </Text>
+    </Stack>
+    <Stack
+      horizontal={true}
+      style={
+        Object {
+          "marginTop": 16,
+          "position": "relative",
+          "width": "100%",
        }
      }
-      toggleCopilot={[Function]}
-    />
+      verticalAlign="center"
+    >
+      <StyledTextFieldBase
+        autoComplete="off"
+        disabled={false}
+        id="naturalLanguageInput"
+        onChange={[Function]}
+        onClick={[Function]}
+        onKeyDown={[Function]}
+        style={
+          Object {
+            "lineHeight": 30,
+          }
+        }
+        styles={
+          Object {
+            "root": Object {
+              "width": "95%",
+            },
+          }
+        }
+        value=""
+      />
+      <CustomizedIconButton
+        disabled={true}
+        iconProps={
+          Object {
+            "iconName": "Send",
+          }
+        }
+        onClick={[Function]}
+        style={
+          Object {
+            "marginLeft": 8,
+          }
+        }
+      />
+    </Stack>
+    <Stack
+      style={
+        Object {
+          "marginBottom": 24,
+          "marginTop": 8,
+        }
+      }
+    >
+      <Text
+        style={
+          Object {
+            "fontSize": 12,
+          }
+        }
+      >
+        AI-generated content can have mistakes. Make sure it's accurate and appropriate before using it.
+         
+        <StyledLinkBase
+          href="https://aka.ms/cdb-copilot-preview-terms"
+          target="_blank"
+        >
+          Read preview terms
+        </StyledLinkBase>
+      </Text>
+    </Stack>
    <Stack
      className="tabPaneContentContainer"
    >
@@ -58,10 +117,10 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
        onDragEnd={null}
        onDragStart={null}
        onSecondaryPaneSizeChange={null}
-        percentage={true}
+        percentage={false}
        primaryIndex={0}
-        primaryMinSize={30}
-        secondaryMinSize={70}
+        primaryMinSize={100}
+        secondaryMinSize={200}
        vertical={true}
      >
        <EditorReact
@@ -77,6 +136,20 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
        <QueryCopilotResults />
      </t>
    </Stack>
+    <WelcomeModal
+      visible={true}
+    />
+    <DeletePopup
+      clearFeedback={[Function]}
+      setQuery={[Function]}
+      setShowDeletePopup={[Function]}
+      showDeletePopup={false}
+      showFeedbackBar={[Function]}
+    />
+    <CopyPopup
+      setShowCopyPopup={[Function]}
+      showCopyPopup={false}
+    />
  </div>
 </Stack>
 `;
--- a/src/Explorer/Quickstart/VCoreMongoQuickstartCommands.ts
+++ b/src/Explorer/Quickstart/VCoreMongoQuickstartCommands.ts
@@ -1,6 +1,5 @@
 export const newDbAndCollectionCommand = `use quickstartDB
-db.createCollection('sampleCollection')
-`;
+db.createCollection('sampleCollection')`;

 export const newDbAndCollectionCommandForDisplay = `use quickstartDB // Create new database named 'quickstartDB' or switch to it if it already exists

@@ -17,25 +16,19 @@ export const loadDataCommand = `db.sampleCollection.insertMany([
    {title: "War and Peace", author: "Leo Tolstoy", pages: 1392},
    {title: "The Odyssey", author: "Homer", pages: 374},
    {title: "Ulysses", author: "James Joyce", pages: 730}
-  ])
-`;
+  ])`;

-export const findOrwellCommand = `db.sampleCollection.find({author: "George Orwell"})
-`;
+export const queriesCommand = `db.sampleCollection.find({author: "George Orwell"})

-export const findOrwellCommandForDisplay = `// Query to find all books written by "George Orwell"
-db.sampleCollection.find({author: "George Orwell"})`;
-
-export const findByPagesCommand = `db.sampleCollection.find({pages: {$gt: 500}})
-`;
-
-export const findByPagesCommandForDisplay = `// Query to find all books with more than 500 pages
 db.sampleCollection.find({pages: {$gt: 500}})
-`;

-export const findAndSortCommand = `db.sampleCollection.find({}).sort({pages: 1})
-`;
+db.sampleCollection.find({}).sort({pages: 1})`;

-export const findAndSortCommandForDisplay = `// Query to find all books and sort them by the number of pages in ascending order
-db.sampleCollection.find({}).sort({pages: 1})
-`;
+export const queriesCommandForDisplay = `// Query to find all books written by "George Orwell"
+db.sampleCollection.find({author: "George Orwell"})
+
+// Query to find all books with more than 500 pages
+db.sampleCollection.find({pages: {$gt: 500}})
+
+// Query to find all books and sort them by the number of pages in ascending order
+db.sampleCollection.find({}).sort({pages: 1})`;
--- a/src/Explorer/Quickstart/VCoreMongoQuickstartGuide.tsx
+++ b/src/Explorer/Quickstart/VCoreMongoQuickstartGuide.tsx
@@ -9,17 +9,15 @@ import {
  Text,
  TextField,
 } from "@fluentui/react";
+import { sendMessage } from "Common/MessageHandler";
+import { MessageTypes } from "Contracts/ExplorerContracts";
 import { customPivotHeaderRenderer } from "Explorer/Quickstart/Shared/QuickstartRenderUtilities";
 import {
-  findAndSortCommand,
-  findAndSortCommandForDisplay,
-  findByPagesCommand,
-  findByPagesCommandForDisplay,
-  findOrwellCommand,
-  findOrwellCommandForDisplay,
  loadDataCommand,
  newDbAndCollectionCommand,
  newDbAndCollectionCommandForDisplay,
+  queriesCommand,
+  queriesCommandForDisplay,
 } from "Explorer/Quickstart/VCoreMongoQuickstartCommands";
 import { useTerminal } from "hooks/useTerminal";
 import React, { useState } from "react";
@@ -65,16 +63,28 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
            >
              <Stack style={{ marginTop: 20 }}>
                <Text>
-                  This tutorial guides you to create and query distributed tables using a sample dataset.
+                  A hosted mongosh (mongo shell) is provided for this quick start. You are automatically logged in to
+                  mongosh, allowing you to interact with your database directly.
                  <br />
                  <br />
-                  To start, input the admin password you used during the cluster creation process into the MongoDB vCore
-                  terminal.
+                  When not in the quick start guide, connecting to Azure Cosmos DB for MongoDB vCore is straightforward
+                  using your connection string.
                  <br />
                  <br />
+                  <Link
+                    aria-label="View connection string"
+                    href=""
+                    onClick={() => sendMessage({ type: MessageTypes.OpenVCoreMongoConnectionStringsBlade })}
+                  >
+                    View connection string
+                  </Link>
                  <br />
-                  Note: If you navigate out of the Quick start blade &#40;MongoDB vCore Shell&#41;, the session will be
-                  closed and all ongoing commands might be interrupted.
+                  <br />
+                  This string contains placeholders for &lt;user&gt; and &lt;password&gt;. Replace them with your chosen
+                  username and password to establish a secure connection to your cluster. Depending on your environment,
+                  you may need to adjust firewall rules or configure private endpoints in the &lsquo;Networking&rsquo;
+                  tab of your database settings, or modify your own network&apos;s firewall settings, to successfully
+                  connect.
                </Text>
              </Stack>
            </PivotItem>
@@ -93,7 +103,6 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
                  documents are similar to the columns in a relational database table. One key advantage of MongoDB is
                  that these documents within a collection can have different fields.
                  <br />
-                  <br />
                  You&apos;re now going to create a new database and a collection within that database using the Mongo
                  shell. In MongoDB, creating a database or a collection is implicit. This means that databases and
                  collections are created when you first reference them in a command, so no explicit creation command is
@@ -144,14 +153,14 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
                  with data. In MongoDB, data is stored as documents, which are structured as field and value pairs.
                  <br />
                  <br />
-                  We&apos;ll add 10 documents representing books, each with a title, author, and number of pages, to
-                  your sampleCollection in the quickstartDB database.
+                  Let&apos;s populate your sampleCollection with data. We&apos;ll add 10 documents representing books,
+                  each with a title, author, and number of pages, to your sampleCollection in the quickstartDB database.
                </Text>
                <DefaultButton
                  style={{ marginTop: 16, width: 200 }}
                  onClick={() => useTerminal.getState().sendMessage(loadDataCommand)}
                >
-                  Load data
+                  Create distributed table
                </DefaultButton>
                <Stack horizontal style={{ marginTop: 16 }}>
                  <TextField
@@ -188,23 +197,23 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
            >
              <Stack style={{ marginTop: 20 }}>
                <Text>
-                  Once you&apos;ve inserted data into your sampleCollection, you can retrieve it using queries. MongoDB
+                  Once you’ve inserted data into your sampleCollection, you can retrieve it using queries. MongoDB
                  queries can be as simple or as complex as you need them to be, allowing you to filter, sort, and limit
                  results.
                </Text>
                <DefaultButton
                  style={{ marginTop: 16, width: 110 }}
-                  onClick={() => useTerminal.getState().sendMessage(findOrwellCommand)}
+                  onClick={() => useTerminal.getState().sendMessage(queriesCommand)}
                >
-                  Try query
+                  Load data
                </DefaultButton>
                <Stack horizontal style={{ marginTop: 16 }}>
                  <TextField
-                    id="findOrwellCommand"
+                    id="queriesCommand"
                    multiline
-                    rows={2}
+                    rows={5}
                    readOnly
-                    defaultValue={findOrwellCommandForDisplay}
+                    defaultValue={queriesCommandForDisplay}
                    styles={{
                      root: { width: "90%" },
                      field: {
@@ -218,71 +227,13 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
                    iconProps={{
                      iconName: "Copy",
                    }}
-                    onClick={() => onCopyBtnClicked("#findOrwellCommand")}
-                  />
-                </Stack>
-                <DefaultButton
-                  style={{ marginTop: 32, width: 110 }}
-                  onClick={() => useTerminal.getState().sendMessage(findByPagesCommand)}
-                >
-                  Try query
-                </DefaultButton>
-                <Stack horizontal style={{ marginTop: 16 }}>
-                  <TextField
-                    id="findByPagesCommand"
-                    multiline
-                    rows={2}
-                    readOnly
-                    defaultValue={findByPagesCommandForDisplay}
-                    styles={{
-                      root: { width: "90%" },
-                      field: {
-                        backgroundColor: "#EEEEEE",
-                        fontFamily:
-                          "Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New",
-                      },
-                    }}
-                  />
-                  <IconButton
-                    iconProps={{
-                      iconName: "Copy",
-                    }}
-                    onClick={() => onCopyBtnClicked("#findByPagesCommand")}
-                  />
-                </Stack>
-                <DefaultButton
-                  style={{ marginTop: 32, width: 110 }}
-                  onClick={() => useTerminal.getState().sendMessage(findAndSortCommand)}
-                >
-                  Try query
-                </DefaultButton>
-                <Stack horizontal style={{ marginTop: 16 }}>
-                  <TextField
-                    id="findAndSortCommand"
-                    multiline
-                    rows={2}
-                    readOnly
-                    defaultValue={findAndSortCommandForDisplay}
-                    styles={{
-                      root: { width: "90%" },
-                      field: {
-                        backgroundColor: "#EEEEEE",
-                        fontFamily:
-                          "Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New",
-                      },
-                    }}
-                  />
-                  <IconButton
-                    iconProps={{
-                      iconName: "Copy",
-                    }}
-                    onClick={() => onCopyBtnClicked("#findAndSortCommand")}
+                    onClick={() => onCopyBtnClicked("#queriesCommand")}
                  />
                </Stack>
              </Stack>
            </PivotItem>
            <PivotItem
-              headerText="Next steps"
+              headerText="Integrations"
              onRenderItemLink={(props, defaultRenderer) =>
                customPivotHeaderRenderer(props, defaultRenderer, currentStep, 4)
              }
@@ -291,18 +242,46 @@ export const VcoreMongoQuickstartGuide: React.FC = (): JSX.Element => {
            >
              <Stack>
                <Text>
-                  <b>Migrate existing data</b>
-                  <br />
-                  <br />
-                  Modernize your data seamlessly from an existing MongoDB cluster, whether it&apos;s on-premises or
-                  hosted in the cloud, to Azure Cosmos DB for MongoDB vCore.&nbsp;
-                  <Link
-                    target="_blank"
-                    href="https://learn.microsoft.com/azure/cosmos-db/mongodb/vcore/migration-options"
-                  >
-                    Learn more
-                  </Link>
+                  Cosmos DB for MongoDB vCore seamlessly integrates with Azure services. These integrations enable
+                  Cosmos DB for MongoDB and its partner products to directly interoperate, ensuring a smooth and unified
+                  experience, that just works.
                </Text>
+                <Stack horizontal>
+                  <Stack style={{ marginTop: 20, marginRight: 20 }}>
+                    <Text>
+                      <b>First party integrations</b>
+                      <br />
+                      <br />
+                      <b>Azure Monitor</b>
+                      <br />
+                      Azure monitor provides comprehensive monitoring and diagnostics for Cosmos DB for Mongo DB. Learn
+                      more
+                      <br />
+                      <br />
+                      <b>Azure Networking</b>
+                      <br />
+                      Azure Networking seamlessly integrates with Azure Cosmos DB for Mongo DB for fast and secure data
+                      access. Learn more
+                      <br />
+                      <br />
+                      <b>PowerShell/CLI/ARM</b>
+                      <br />
+                      PowerShell/CLI/ARM seamlessly integrates with Azure Cosmos DB for Mongo DB for efficient
+                      management and automation. Learn more
+                    </Text>
+                  </Stack>
+                  <Stack style={{ marginTop: 20, marginLeft: 20 }}>
+                    <Text>
+                      <b>Application platforms integrations</b>
+                      <br />
+                      <br />
+                      <b>Vercel</b>
+                      <br />
+                      Vercel is a cloud platform for hosting static front ends and serverless functions, with instant
+                      deployments, automated scaling, and Next.js integration. Learn more
+                    </Text>
+                  </Stack>
+                </Stack>
              </Stack>
            </PivotItem>
          </Pivot>
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -19,7 +19,6 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
 import { useCarousel } from "hooks/useCarousel";
 import { usePostgres } from "hooks/usePostgres";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import * as React from "react";
 import ConnectIcon from "../../../images/Connect_color.svg";
@@ -105,12 +104,6 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
          (state) => state.sampleDataResourceTokenCollection,
        ),
      },
-      {
-        dispose: useQueryCopilot.subscribe(
-          () => this.setState({}),
-          (state) => state.copilotEnabled,
-        ),
-      },
    );
  }

@@ -121,9 +114,9 @@ export class SplashScreen extends React.Component<SplashScreenProps> {

  private getSplashScreenButtons = (): JSX.Element => {
    if (
-      userContext.apiType === "SQL" &&
-      useQueryCopilot.getState().copilotEnabled &&
-      useDatabases.getState().sampleDataResourceTokenCollection
+      useDatabases.getState().sampleDataResourceTokenCollection &&
+      userContext.features.enableCopilot &&
+      userContext.apiType === "SQL"
    ) {
      return (
        <Stack style={{ width: "66%", cursor: "pointer", margin: "40px auto" }} tokens={{ childrenGap: 16 }}>
--- a/src/Explorer/Tables/TableDataClient.ts
+++ b/src/Explorer/Tables/TableDataClient.ts
@@ -147,7 +147,7 @@ export class CassandraAPIDataClient extends TableDataClient {
    let properties = "(";
    let values = "(";
    for (let property in entity) {
-      if (entity[property]._ === "" || entity[property]._ === undefined) {
+      if (entity[property]._ === null) {
        continue;
      }
      properties = properties.concat(`${property}, `);
@@ -208,9 +208,6 @@ export class CassandraAPIDataClient extends TableDataClient {
          !originalDocument[property] ||
          newEntity[property]._.toString() !== originalDocument[property]._.toString()
        ) {
-          if (newEntity[property]._.toString() === "" || newEntity[property]._ === undefined) {
-            continue;
-          }
          let propertyQuerySegment = this.isStringType(newEntity[property].$)
            ? `${property} = '${newEntity[property]._}',`
            : `${property} = ${newEntity[property]._},`;
--- a/src/Explorer/Tabs/DocumentsTab.html
+++ b/src/Explorer/Tabs/DocumentsTab.html
@@ -98,7 +98,7 @@
            <button
              class="filterbtnstyle queryButton"
              data-bind="
-                                click: refreshDocumentsGrid.bind($data, true),
+                                click: refreshDocumentsGrid,
                                enable: applyFilterButton.enabled"
              aria-label="Apply filter"
              tabindex="0"
@@ -106,18 +106,6 @@
              Apply Filter
            </button>
          </span>
-          <span class="filterbuttonpad">
-            <button
-              class="filterbtnstyle queryButton"
-              data-bind="
-                                visible: !isPreferredApiMongoDB && isExecuting,
-                                click: onAbortQueryClick"
-              aria-label="Cancel Query"
-              tabindex="0"
-            >
-              Cancel Query
-            </button>
-          </span>
          <span
            class="filterclose"
            role="button"
@@ -176,7 +164,7 @@
                  <img
                    class="refreshcol"
                    src="/refresh-cosmos.svg"
-                    data-bind="click: refreshDocumentsGrid.bind($data, false)"
+                    data-bind="click: refreshDocumentsGrid"
                    alt="Refresh documents"
                    tabindex="0"
                  />
@@ -209,10 +197,7 @@
          </table>
        </div>
        <div class="loadMore">
-          <a
-            role="button"
-            data-bind="click: loadNextPage.bind($data, false), event: { keypress: onLoadMoreKeyInput }"
-            tabindex="0"
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
            >Load more</a
          >
        </div>
--- a/src/Explorer/Tabs/DocumentsTab.ts
+++ b/src/Explorer/Tabs/DocumentsTab.ts
@@ -1,15 +1,12 @@
-import { ItemDefinition, PartitionKey, PartitionKeyDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { extractPartitionKey, ItemDefinition, PartitionKeyDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import { querySampleDocuments, readSampleDocument } from "Explorer/QueryCopilot/QueryCopilotUtilities";
-import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import * as ko from "knockout";
 import Q from "q";
-import { format } from "react-string-format";
 import DeleteDocumentIcon from "../../../images/DeleteDocument.svg";
-import NewDocumentIcon from "../../../images/NewDocument.svg";
-import UploadIcon from "../../../images/Upload_16x16.svg";
 import DiscardIcon from "../../../images/discard.svg";
+import NewDocumentIcon from "../../../images/NewDocument.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
+import UploadIcon from "../../../images/Upload_16x16.svg";
 import * as Constants from "../../Common/Constants";
 import {
  DocumentsGridMetrics,
@@ -17,15 +14,15 @@ import {
  QueryCopilotSampleContainerId,
  QueryCopilotSampleDatabaseId,
 } from "../../Common/Constants";
-import editable from "../../Common/EditableUtility";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
-import * as HeadersUtility from "../../Common/HeadersUtility";
-import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { deleteDocument } from "../../Common/dataAccess/deleteDocument";
 import { queryDocuments } from "../../Common/dataAccess/queryDocuments";
 import { readDocument } from "../../Common/dataAccess/readDocument";
 import { updateDocument } from "../../Common/dataAccess/updateDocument";
+import editable from "../../Common/EditableUtility";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
+import * as HeadersUtility from "../../Common/HeadersUtility";
+import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
@@ -33,7 +30,6 @@ import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import { logConsoleError } from "../../Utils/NotificationConsoleUtils";
 import * as QueryUtils from "../../Utils/QueryUtils";
-import { extractPartitionKeyValues } from "../../Utils/QueryUtils";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import { useDialog } from "../Controls/Dialog";
 import Explorer from "../Explorer";
@@ -82,8 +78,6 @@ export default class DocumentsTab extends TabsBase {
  private _documentsIterator: QueryIterator<ItemDefinition & Resource>;
  private _resourceTokenPartitionKey: string;
  private _isQueryCopilotSampleContainer: boolean;
-  private queryAbortController: AbortController;
-  private cancelQueryTimeoutID: NodeJS.Timeout;

  constructor(options: ViewModels.DocumentsTabOptions) {
    super(options);
@@ -331,7 +325,6 @@ export default class DocumentsTab extends TabsBase {

    this.showPartitionKey = this._shouldShowPartitionKey();
    this._isQueryCopilotSampleContainer =
-      this.collection?.isSampleCollection &&
      this.collection?.databaseId === QueryCopilotSampleDatabaseId &&
      this.collection?.id() === QueryCopilotSampleContainerId;
  }
@@ -352,22 +345,6 @@ export default class DocumentsTab extends TabsBase {
    return true;
  }

-  /**
-   * Query first page of documents
-   * Select and query first document and display content
-   */
-  private async autoPopulateContent(applyFilterButtonPressed?: boolean) {
-    // reset iterator
-    this._documentsIterator = this.createIterator();
-    // load documents
-    await this.loadNextPage(applyFilterButtonPressed);
-
-    // Select first document and load content
-    if (this.documentIds().length > 0) {
-      this.documentIds()[0].click();
-    }
-  }
-
  public onShowFilterClick(): Q.Promise<any> {
    this.isFilterCreated(true);
    this.isFilterExpanded(true);
@@ -397,14 +374,15 @@ export default class DocumentsTab extends TabsBase {
    return true;
  };

-  public async refreshDocumentsGrid(applyFilterButtonPressed?: boolean): Promise<void> {
+  public async refreshDocumentsGrid(): Promise<void> {
    // clear documents grid
    this.documentIds([]);
+
    try {
      // reset iterator
      this._documentsIterator = this.createIterator();
      // load documents
-      await this.autoPopulateContent(applyFilterButtonPressed);
+      await this.loadNextPage();
      // collapse filter
      this.appliedFilter(this.filterContent());
      this.isFilterExpanded(false);
@@ -423,15 +401,6 @@ export default class DocumentsTab extends TabsBase {
    return true;
  };

-  public onAbortQueryClick(): void {
-    this.queryAbortController.abort();
-  }
-
-  /**
-   * TODO Doesn't seem to be used: remove?
-   * @param clickedDocumentId
-   * @returns
-   */
  public onDocumentIdClick(clickedDocumentId: DocumentId): Q.Promise<any> {
    if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
      return Q();
@@ -481,7 +450,7 @@ export default class DocumentsTab extends TabsBase {
          const value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
          this.selectedDocumentContent.setBaseline(value);
          this.initialDocumentContent(value);
-          const partitionKeyValueArray: PartitionKey[] = extractPartitionKeyValues(
+          const partitionKeyValueArray = extractPartitionKey(
            savedDocument,
            this.partitionKey as PartitionKeyDefinition,
          );
@@ -532,10 +501,7 @@ export default class DocumentsTab extends TabsBase {
    const selectedDocumentId = this.selectedDocumentId();
    const documentContent = JSON.parse(this.selectedDocumentContent());

-    const partitionKeyValueArray: PartitionKey[] = extractPartitionKeyValues(
-      documentContent,
-      this.partitionKey as PartitionKeyDefinition,
-    );
+    const partitionKeyValueArray = extractPartitionKey(documentContent, this.partitionKey as PartitionKeyDefinition);
    selectedDocumentId.partitionKeyValue = partitionKeyValueArray;

    this.isExecutionError(false);
@@ -653,7 +619,8 @@ export default class DocumentsTab extends TabsBase {

    if (!this._documentsIterator) {
      try {
-        await this.autoPopulateContent();
+        this._documentsIterator = this.createIterator();
+        await this.loadNextPage();
      } catch (error) {
        if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
          TelemetryProcessor.traceFailure(
@@ -721,7 +688,6 @@ export default class DocumentsTab extends TabsBase {
  }

  public createIterator(): QueryIterator<ItemDefinition & Resource> {
-    this.queryAbortController = new AbortController();
    const filter: string = this.filterContent().trim();
    const query: string = this.buildQuery(filter);
    let options: any = {};
@@ -730,7 +696,7 @@ export default class DocumentsTab extends TabsBase {
    if (this._resourceTokenPartitionKey) {
      options.partitionKey = this._resourceTokenPartitionKey;
    }
-    options.abortSignal = this.queryAbortController.signal;
+
    return this._isQueryCopilotSampleContainer
      ? querySampleDocuments(query, options)
      : queryDocuments(this.collection.databaseId, this.collection.id(), query, options);
@@ -744,35 +710,9 @@ export default class DocumentsTab extends TabsBase {
    this.initDocumentEditor(documentId, content);
  }

-  public loadNextPage(applyFilterButtonClicked?: boolean): Q.Promise<any> {
+  public loadNextPage(): Q.Promise<any> {
    this.isExecuting(true);
    this.isExecutionError(false);
-    let automaticallyCancelQueryAfterTimeout: boolean;
-    if (applyFilterButtonClicked && this.queryTimeoutEnabled()) {
-      const queryTimeout: number = LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout);
-      automaticallyCancelQueryAfterTimeout = LocalStorageUtility.getEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-      );
-      const cancelQueryTimeoutID: NodeJS.Timeout = setTimeout(() => {
-        if (this.isExecuting()) {
-          if (automaticallyCancelQueryAfterTimeout) {
-            this.queryAbortController.abort();
-          } else {
-            useDialog
-              .getState()
-              .showOkCancelModalDialog(
-                QueryConstants.CancelQueryTitle,
-                format(QueryConstants.CancelQuerySubTextTemplate, QueryConstants.CancelQueryTimeoutThresholdReached),
-                "Yes",
-                () => this.queryAbortController.abort(),
-                "No",
-                undefined,
-              );
-          }
-        }
-      }, queryTimeout);
-      this.cancelQueryTimeoutID = cancelQueryTimeoutID;
-    }
    return this._loadNextPageInternal()
      .then(
        (documentsIdsResponse = []) => {
@@ -828,15 +768,7 @@ export default class DocumentsTab extends TabsBase {
          }
        },
      )
-      .finally(() => {
-        this.isExecuting(false);
-        if (applyFilterButtonClicked && this.queryTimeoutEnabled()) {
-          clearTimeout(this.cancelQueryTimeoutID);
-          if (!automaticallyCancelQueryAfterTimeout) {
-            useDialog.getState().closeDialog();
-          }
-        }
-      });
+      .finally(() => this.isExecuting(false));
  }

  public onLoadMoreKeyInput = (source: any, event: KeyboardEvent): void => {
@@ -1014,8 +946,4 @@ export default class DocumentsTab extends TabsBase {
        useSelectedNode.getState().isQueryCopilotCollectionSelected(),
    };
  }
-
-  private queryTimeoutEnabled(): boolean {
-    return !this.isPreferredApiMongoDB && LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled);
-  }
 }
--- a/src/Explorer/Tabs/MongoDocumentsTab.ts
+++ b/src/Explorer/Tabs/MongoDocumentsTab.ts
@@ -1,5 +1,4 @@
-import { PartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
-import { extractPartitionKeyValues } from "Utils/QueryUtils";
+import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
 import * as Constants from "../../Common/Constants";
@@ -89,7 +88,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
    )
      .then(
        (savedDocument: any) => {
-          const partitionKeyArray: PartitionKey[] = extractPartitionKeyValues(
+          let partitionKeyArray = extractPartitionKey(
            savedDocument,
            this._getPartitionKeyDefinition() as PartitionKeyDefinition,
          );
@@ -151,7 +150,7 @@ export default class MongoDocumentsTab extends DocumentsTab {

          this.documentIds().forEach((documentId: DocumentId) => {
            if (documentId.rid === updatedDocument._rid) {
-              const partitionKeyArray: PartitionKey[] = extractPartitionKeyValues(
+              const partitionKeyArray = extractPartitionKey(
                updatedDocument,
                this._getPartitionKeyDefinition() as PartitionKeyDefinition,
              );
@@ -290,7 +289,7 @@ export default class MongoDocumentsTab extends DocumentsTab {
  }

  private _hasShardKeySpecified(document: any): boolean {
-    return Boolean(extractPartitionKeyValues(document, this._getPartitionKeyDefinition() as PartitionKeyDefinition));
+    return Boolean(extractPartitionKey(document, this._getPartitionKeyDefinition() as PartitionKeyDefinition));
  }

  private _getPartitionKeyDefinition(): DataModels.PartitionKey {
--- a/src/Explorer/Tabs/QueryTab/QueryTab.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTab.tsx
@@ -1,16 +1,11 @@
-import { CopilotProvider } from "Explorer/QueryCopilot/QueryCopilotContext";
-import { userContext } from "UserContext";
 import React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
 import type { QueryTabOptions } from "../../../Contracts/ViewModels";
 import { useTabs } from "../../../hooks/useTabs";
 import Explorer from "../../Explorer";
-import QueryTabComponent, {
-  IQueryTabComponentProps,
-  ITabAccessor,
-  QueryTabFunctionComponent,
-} from "../../Tabs/QueryTab/QueryTabComponent";
+import { IQueryTabComponentProps, ITabAccessor } from "../../Tabs/QueryTab/QueryTabComponent";
 import TabsBase from "../TabsBase";
+import QueryTabComponent from "./QueryTabComponent";

 export interface IQueryTabProps {
  container: Explorer;
@@ -45,13 +40,7 @@ export class NewQueryTab extends TabsBase {
  }

  public render(): JSX.Element {
-    return userContext.apiType === "SQL" ? (
-      <CopilotProvider>
-        <QueryTabFunctionComponent {...this.iQueryTabComponentProps} />
-      </CopilotProvider>
-    ) : (
-      <QueryTabComponent {...this.iQueryTabComponentProps} />
-    );
+    return <QueryTabComponent {...this.iQueryTabComponentProps} />;
  }

  public onTabClick(): void {
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.test.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.test.tsx
@@ -1,16 +1,6 @@
 import { fireEvent, render } from "@testing-library/react";
-import { CollectionTabKind } from "Contracts/ViewModels";
-import { CopilotProvider } from "Explorer/QueryCopilot/QueryCopilotContext";
-import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
-import QueryTabComponent, {
-  IQueryTabComponentProps,
-  QueryTabFunctionComponent,
-} from "Explorer/Tabs/QueryTab/QueryTabComponent";
-import TabsBase from "Explorer/Tabs/TabsBase";
-import { updateUserContext, userContext } from "UserContext";
-import { mount } from "enzyme";
+import QueryTabComponent, { IQueryTabComponentProps } from "Explorer/Tabs/QueryTab/QueryTabComponent";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
-import { useTabs } from "hooks/useTabs";
 import React from "react";

 jest.mock("Explorer/Controls/Editor/EditorReact");
@@ -21,15 +11,9 @@ describe("QueryTabComponent", () => {
    mockStore.showCopilotSidebar = false;
    mockStore.setShowCopilotSidebar = jest.fn();
  });
-  afterEach(() => jest.clearAllMocks());
+  beforeEach(() => jest.clearAllMocks());

-  it("should launch conversational Copilot when ALT+C is pressed and when copilot version is 3", () => {
-    updateUserContext({
-      features: {
-        ...userContext.features,
-        copilotVersion: "v3.0",
-      },
-    });
+  it("should launch Copilot when ALT+C is pressed", () => {
    const propsMock: Readonly<IQueryTabComponentProps> = {
      collection: { databaseId: "CopilotSampleDb" },
      onTabAccessor: () => jest.fn(),
@@ -47,32 +31,4 @@ describe("QueryTabComponent", () => {

    expect(mockStore.setShowCopilotSidebar).toHaveBeenCalledWith(true);
  });
-
-  it("copilot should be enabled by default when tab is active", () => {
-    useQueryCopilot.getState().setCopilotEnabled(true);
-    useQueryCopilot.getState().setCopilotUserDBEnabled(true);
-    const activeTab = new TabsBase({
-      tabKind: CollectionTabKind.Query,
-      title: "Query",
-      tabPath: "",
-    });
-    activeTab.tabId = "mockTabId";
-    useTabs.getState().activeTab = activeTab;
-    const propsMock: Readonly<IQueryTabComponentProps> = {
-      collection: { databaseId: "CopilotUserDb", id: () => "CopilotUserContainer" },
-      onTabAccessor: () => jest.fn(),
-      isExecutionError: false,
-      tabId: "mockTabId",
-      tabsBaseInstance: {
-        updateNavbarWithTabsButtons: () => jest.fn(),
-      },
-    } as unknown as IQueryTabComponentProps;
-
-    const container = mount(
-      <CopilotProvider>
-        <QueryTabFunctionComponent {...propsMock} />
-      </CopilotProvider>,
-    );
-    expect(container.find(QueryCopilotPromptbar).exists()).toBe(true);
-  });
 });
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -1,29 +1,16 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-console */
 import { FeedOptions } from "@azure/cosmos";
-import { useDialog } from "Explorer/Controls/Dialog";
-import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
-import { useCopilotStore } from "Explorer/QueryCopilot/QueryCopilotContext";
-import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
-import { OnExecuteQueryClick, QueryDocumentsPerPage } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
+import { OnExecuteQueryClick } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
+import { QueryCopilotResults } from "Explorer/QueryCopilot/Shared/QueryCopilotResults";
 import { QueryCopilotSidebar } from "Explorer/QueryCopilot/V2/Sidebar/QueryCopilotSidebar";
 import { QueryResultSection } from "Explorer/Tabs/QueryTab/QueryResultSection";
-import { useSelectedNode } from "Explorer/useSelectedNode";
-import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
-import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
-import { TabsState, useTabs } from "hooks/useTabs";
 import React, { Fragment } from "react";
 import SplitterLayout from "react-splitter-layout";
 import "react-splitter-layout/lib/index.css";
-import { format } from "react-string-format";
-import QueryCommandIcon from "../../../../images/CopilotCommand.svg";
 import LaunchCopilot from "../../../../images/CopilotTabIcon.svg";
-import CancelQueryIcon from "../../../../images/Entity_cancel.svg";
 import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
 import SaveQueryIcon from "../../../../images/save-cosmos.svg";
-import { NormalizedEventKey } from "../../../Common/Constants";
+import { NormalizedEventKey, QueryCopilotSampleDatabaseId } from "../../../Common/Constants";
 import { getErrorMessage } from "../../../Common/ErrorHandlingUtils";
 import * as HeadersUtility from "../../../Common/HeadersUtility";
 import { MinimalQueryIterator } from "../../../Common/IteratorUtilities";
@@ -32,8 +19,6 @@ import { queryDocuments } from "../../../Common/dataAccess/queryDocuments";
 import { queryDocumentsPage } from "../../../Common/dataAccess/queryDocumentsPage";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import * as StringUtility from "../../../Shared/StringUtility";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
 import * as QueryUtils from "../../../Utils/QueryUtils";
 import { useSidePanel } from "../../../hooks/useSidePanel";
@@ -82,9 +67,6 @@ export interface IQueryTabComponentProps {
  isPreferredApiMongoDB?: boolean;
  monacoEditorSetting?: string;
  viewModelcollection?: ViewModels.Collection;
-  copilotEnabled?: boolean;
-  isSampleCopilotActive?: boolean;
-  copilotStore?: Partial<QueryCopilotState>;
 }

 interface IQueryTabStates {
@@ -97,26 +79,8 @@ interface IQueryTabStates {
  isExecuting: boolean;
  showCopilotSidebar: boolean;
  queryCopilotGeneratedQuery: string;
-  cancelQueryTimeoutID: NodeJS.Timeout;
-  copilotActive: boolean;
-  currentTabActive: boolean;
 }

-export const QueryTabFunctionComponent = (props: IQueryTabComponentProps): any => {
-  const copilotStore = useCopilotStore();
-  const copilotGlobalStore = useQueryCopilot();
-  const isSampleCopilotActive = useSelectedNode.getState().isQueryCopilotCollectionSelected();
-  const queryTabProps = {
-    ...props,
-    copilotEnabled:
-      copilotGlobalStore.copilotEnabled &&
-      (copilotGlobalStore.copilotUserDBEnabled || (isSampleCopilotActive && !!userContext.sampleDataConnectionInfo)),
-    isSampleCopilotActive: isSampleCopilotActive,
-    copilotStore: copilotStore,
-  };
-  return <QueryTabComponent {...queryTabProps}></QueryTabComponent>;
-};
-
 export default class QueryTabComponent extends React.Component<IQueryTabComponentProps, IQueryTabStates> {
  public queryEditorId: string;
  public executeQueryButton: Button;
@@ -127,7 +91,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
  public isCloseClicked: boolean;
  public isCopilotTabActive: boolean;
  private _iterator: MinimalQueryIterator;
-  private queryAbortController: AbortController;

  constructor(props: IQueryTabComponentProps) {
    super(props);
@@ -142,15 +105,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      isExecuting: false,
      showCopilotSidebar: useQueryCopilot.getState().showCopilotSidebar,
      queryCopilotGeneratedQuery: useQueryCopilot.getState().query,
-      cancelQueryTimeoutID: undefined,
-      copilotActive: this._queryCopilotActive(),
-      currentTabActive: true,
    };
    this.isCloseClicked = false;
    this.splitterId = this.props.tabId + "_splitter";
    this.queryEditorId = `queryeditor${this.props.tabId}`;
    this.isPreferredApiMongoDB = this.props.isPreferredApiMongoDB;
-    this.isCopilotTabActive = userContext.features.copilotVersion === "v3.0";
+    this.isCopilotTabActive = QueryCopilotSampleDatabaseId === this.props.collection.databaseId;
+
    this.executeQueryButton = {
      enabled: !!this.state.sqlQueryEditorContent && this.state.sqlQueryEditorContent.length > 0,
      visible: true,
@@ -175,19 +136,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
    });
  }

-  private _queryCopilotActive(): boolean {
-    if (this.props.copilotEnabled) {
-      const cachedCopilotToggleStatus: string = localStorage.getItem(
-        `${userContext.databaseAccount?.id}-queryCopilotToggleStatus`,
-      );
-      const copilotInitialActive: boolean = cachedCopilotToggleStatus
-        ? StringUtility.toBoolean(cachedCopilotToggleStatus)
-        : true;
-      return copilotInitialActive;
-    }
-    return false;
-  }
-
  public onCloseClick(isClicked: boolean): void {
    this.isCloseClicked = isClicked;
    if (useQueryCopilot.getState().wasCopilotUsed && this.isCopilotTabActive) {
@@ -212,16 +160,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
    setTimeout(async () => {
      await this._executeQueryDocumentsPage(0);
    }, 100);
-    if (this.state.copilotActive) {
-      const query = this.state.sqlQueryEditorContent.split("\r\n")?.pop();
-      const isqueryEdited = this.props.copilotStore.generatedQuery && this.props.copilotStore.generatedQuery !== query;
-      if (isqueryEdited) {
-        TelemetryProcessor.traceMark(Action.QueryEdited, {
-          databaseName: this.props.collection.databaseId,
-          collectionId: this.props.collection.id(),
-        });
-      }
-    }
  };

  public onSaveQueryClick = (): void => {
@@ -276,7 +214,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
  }

  private async _executeQueryDocumentsPage(firstItemIndex: number): Promise<void> {
-    this.queryAbortController = new AbortController();
    if (this._iterator === undefined) {
      this._iterator = this.props.isPreferredApiMongoDB
        ? queryIterator(
@@ -288,10 +225,7 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
            this.props.collection.databaseId,
            this.props.collection.id(),
            this.state.selectedContent || this.state.sqlQueryEditorContent,
-            {
-              enableCrossPartitionQuery: HeadersUtility.shouldEnableCrossPartitionKey(),
-              abortSignal: this.queryAbortController.signal,
-            } as FeedOptions,
+            { enableCrossPartitionQuery: HeadersUtility.shouldEnableCrossPartitionKey() } as FeedOptions,
          );
    }

@@ -310,35 +244,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
    this.setState({
      isExecuting: true,
    });
-    let automaticallyCancelQueryAfterTimeout: boolean;
-    if (this.queryTimeoutEnabled()) {
-      const queryTimeout: number = LocalStorageUtility.getEntryNumber(StorageKey.QueryTimeout);
-      automaticallyCancelQueryAfterTimeout = LocalStorageUtility.getEntryBoolean(
-        StorageKey.AutomaticallyCancelQueryAfterTimeout,
-      );
-      const cancelQueryTimeoutID: NodeJS.Timeout = setTimeout(() => {
-        if (this.state.isExecuting) {
-          if (automaticallyCancelQueryAfterTimeout) {
-            this.queryAbortController.abort();
-          } else {
-            useDialog
-              .getState()
-              .showOkCancelModalDialog(
-                QueryConstants.CancelQueryTitle,
-                format(QueryConstants.CancelQuerySubTextTemplate, QueryConstants.CancelQueryTimeoutThresholdReached),
-                "Yes",
-                () => this.queryAbortController.abort(),
-                "No",
-                undefined,
-              );
-          }
-        }
-      }, queryTimeout);
-      this.setState({
-        cancelQueryTimeoutID,
-      });
-    }
-    useCommandBar.getState().setContextButtons(this.getTabsButtons());

    try {
      const queryResults: ViewModels.QueryResults = await QueryUtils.queryPagesUntilContentPresent(
@@ -361,16 +266,8 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      this.props.tabsBaseInstance.isExecuting(false);
      this.setState({
        isExecuting: false,
-        cancelQueryTimeoutID: undefined,
      });
-      if (this.queryTimeoutEnabled()) {
-        clearTimeout(this.state.cancelQueryTimeoutID);
-        if (!automaticallyCancelQueryAfterTimeout) {
-          useDialog.getState().closeDialog();
-        }
-      }
      this.togglesOnFocus();
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
    }
  }

@@ -381,9 +278,7 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      buttons.push({
        iconSrc: ExecuteQueryIcon,
        iconAlt: label,
-        onCommandClick: this.props.isSampleCopilotActive
-          ? () => OnExecuteQueryClick(this.props.copilotStore)
-          : this.onExecuteQueryClick,
+        onCommandClick: this.isCopilotTabActive ? () => OnExecuteQueryClick() : this.onExecuteQueryClick,
        commandButtonLabel: label,
        ariaLabel: label,
        hasPopup: false,
@@ -437,60 +332,14 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      buttons.push(launchCopilotButton);
    }

-    if (this.props.copilotEnabled) {
-      const toggleCopilotButton = {
-        iconSrc: QueryCommandIcon,
-        iconAlt: "Copilot",
-        onCommandClick: () => {
-          this._toggleCopilot(!this.state.copilotActive);
-        },
-        commandButtonLabel: this.state.copilotActive ? "Disable Copilot" : "Enable Copilot",
-        ariaLabel: "Copilot",
-        hasPopup: false,
-      };
-      buttons.push(toggleCopilotButton);
-    }
-
-    if (!this.props.isPreferredApiMongoDB && this.state.isExecuting) {
-      const label = "Cancel query";
-      buttons.push({
-        iconSrc: CancelQueryIcon,
-        iconAlt: label,
-        onCommandClick: () => this.queryAbortController.abort(),
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-      });
-    }
-
    return buttons;
  }

-  private _toggleCopilot = (active: boolean) => {
-    this.setState({ copilotActive: active });
-    useQueryCopilot.getState().setCopilotEnabledforExecution(active);
-    localStorage.setItem(`${userContext.databaseAccount?.id}-queryCopilotToggleStatus`, active.toString());
-
-    TelemetryProcessor.traceSuccess(active ? Action.ActivateQueryCopilot : Action.DeactivateQueryCopilot, {
-      databaseName: this.props.collection.databaseId,
-      collectionId: this.props.collection.id(),
-    });
-  };
-
-  componentDidUpdate = (_prevProps: IQueryTabComponentProps, prevState: IQueryTabStates): void => {
-    if (prevState.copilotActive !== this.state.copilotActive) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
-    }
-  };
-
  public onChangeContent(newContent: string): void {
    this.setState({
      sqlQueryEditorContent: newContent,
      queryCopilotGeneratedQuery: "",
    });
-    if (this.state.copilotActive) {
-      this.props.copilotStore?.setQuery(newContent);
-    }
    if (this.isPreferredApiMongoDB) {
      if (newContent.length > 0) {
        this.executeQueryButton = {
@@ -525,10 +374,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
        : useQueryCopilot.getState().setSelectedQuery("");
    }

-    if (this.state.copilotActive) {
-      this.props.copilotStore?.setSelectedQuery(selectedContent);
-    }
-
    useCommandBar.getState().setContextButtons(this.getTabsButtons());
  }

@@ -537,29 +382,18 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      return this.state.queryCopilotGeneratedQuery;
    }

-    if (this.state.copilotActive) {
-      return this.props.copilotStore?.query;
-    }
-
    return this.state.sqlQueryEditorContent;
  }

-  private queryTimeoutEnabled(): boolean {
-    return !this.isPreferredApiMongoDB && LocalStorageUtility.getEntryBoolean(StorageKey.QueryTimeoutEnabled);
-  }
-
  private unsubscribeCopilotSidebar: () => void;

  componentDidMount(): void {
-    useTabs.subscribe((state: TabsState) => {
-      if (this.state.currentTabActive && state.activeTab?.tabId !== this.props.tabId) {
-        this.setState({
-          currentTabActive: false,
-        });
-      } else if (!this.state.currentTabActive && state.activeTab?.tabId === this.props.tabId) {
-        this.setState({
-          currentTabActive: true,
-        });
+    this.unsubscribeCopilotSidebar = useQueryCopilot.subscribe((state: QueryCopilotState) => {
+      if (this.state.showCopilotSidebar !== state.showCopilotSidebar) {
+        this.setState({ showCopilotSidebar: state.showCopilotSidebar });
+      }
+      if (this.state.queryCopilotGeneratedQuery !== state.query) {
+        this.setState({ queryCopilotGeneratedQuery: state.query });
      }
    });

@@ -568,6 +402,7 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
  }

  componentWillUnmount(): void {
+    this.unsubscribeCopilotSidebar();
    document.removeEventListener("keydown", this.handleCopilotKeyDown);
  }

@@ -575,14 +410,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
    return (
      <Fragment>
        <div className="tab-pane" id={this.props.tabId} role="tabpanel">
-          {this.props.copilotEnabled && this.state.currentTabActive && this.state.copilotActive && (
-            <QueryCopilotPromptbar
-              explorer={this.props.collection.container}
-              toggleCopilot={this._toggleCopilot}
-              databaseId={this.props.collection.databaseId}
-              containerId={this.props.collection.id()}
-            ></QueryCopilotPromptbar>
-          )}
          <div className="tabPaneContentContainer">
            <SplitterLayout vertical={true} primaryIndex={0} primaryMinSize={100} secondaryMinSize={200}>
              <Fragment>
@@ -591,7 +418,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
                    language={"sql"}
                    content={this.setEditorContent()}
                    isReadOnly={false}
-                    wordWrap={"on"}
                    ariaLabel={"Editing Query"}
                    lineNumbers={"on"}
                    onContentChanged={(newContent: string) => this.onChangeContent(newContent)}
@@ -599,21 +425,8 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
                  />
                </div>
              </Fragment>
-              {this.props.isSampleCopilotActive ? (
-                <QueryResultSection
-                  isMongoDB={this.props.isPreferredApiMongoDB}
-                  queryEditorContent={this.state.sqlQueryEditorContent}
-                  error={this.props.copilotStore?.errorMessage}
-                  queryResults={this.props.copilotStore?.queryResults}
-                  isExecuting={this.props.copilotStore?.isExecuting}
-                  executeQueryDocumentsPage={(firstItemIndex: number) =>
-                    QueryDocumentsPerPage(
-                      firstItemIndex,
-                      this.props.copilotStore.queryIterator,
-                      this.props.copilotStore,
-                    )
-                  }
-                />
+              {this.isCopilotTabActive ? (
+                <QueryCopilotResults />
              ) : (
                <QueryResultSection
                  isMongoDB={this.props.isPreferredApiMongoDB}
@@ -629,14 +442,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
            </SplitterLayout>
          </div>
        </div>
-        {this.props.copilotEnabled && this.props.copilotStore?.showFeedbackModal && (
-          <QueryCopilotFeedbackModal
-            explorer={this.props.collection.container}
-            databaseId={this.props.collection.databaseId}
-            containerId={this.props.collection.id()}
-            mode={this.props.isSampleCopilotActive ? "Sample" : "User"}
-          />
-        )}
      </Fragment>
    );
  }
--- a/src/Explorer/Tabs/Tabs.tsx
+++ b/src/Explorer/Tabs/Tabs.tsx
@@ -11,6 +11,7 @@ import { QuickstartTab } from "Explorer/Tabs/QuickstartTab";
 import { VcoreMongoConnectTab } from "Explorer/Tabs/VCoreMongoConnectTab";
 import { VcoreMongoQuickstartTab } from "Explorer/Tabs/VCoreMongoQuickstartTab";
 import { userContext } from "UserContext";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
 import ko from "knockout";
 import React, { MutableRefObject, useEffect, useRef, useState } from "react";
@@ -169,7 +170,7 @@ const CloseButton = ({
    onClick={(event: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
      event.stopPropagation();
      tab ? tab.onCloseTabButtonClick() : useTabs.getState().closeReactTab(tabKind);
-      // tabKind === ReactTabKind.QueryCopilot && useQueryCopilot.getState().resetQueryCopilotStates();
+      tabKind === ReactTabKind.QueryCopilot && useQueryCopilot.getState().resetQueryCopilotStates();
    }}
    tabIndex={active ? 0 : undefined}
    onKeyPress={({ nativeEvent: e }) => tab.onKeyPressClose(undefined, e)}
@@ -255,7 +256,6 @@ const isQueryErrorThrown = (tab?: Tab, tabKind?: ReactTabKind): boolean => {
 };

 const getReactTabContent = (activeReactTab: ReactTabKind, explorer: Explorer): JSX.Element => {
-  // eslint-disable-next-line no-console
  switch (activeReactTab) {
    case ReactTabKind.Connect:
      return userContext.apiType === "VCoreMongo" ? (
--- a/src/Explorer/Tabs/TabsBase.ts
+++ b/src/Explorer/Tabs/TabsBase.ts
@@ -3,15 +3,15 @@ import * as Constants from "../../Common/Constants";
 import * as ThemeUtility from "../../Common/ThemeUtility";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
-import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { useNotificationConsole } from "../../hooks/useNotificationConsole";
 import { useTabs } from "../../hooks/useTabs";
+import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../Explorer";
 import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
-import { WaitsForTemplateViewModel } from "../WaitsForTemplateViewModel";
 import { useSelectedNode } from "../useSelectedNode";
+import { WaitsForTemplateViewModel } from "../WaitsForTemplateViewModel";
 // TODO: Use specific actions for logging telemetry data
 export default class TabsBase extends WaitsForTemplateViewModel {
  private static id = 0;
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -177,8 +177,8 @@ export default class Collection implements ViewModels.Collection {
    this.children.subscribe(() => {
      // update the database in zustand store
      const database = this.getDatabase();
-      database?.collections(
-        database?.collections()?.map((collection) => {
+      database.collections(
+        database.collections()?.map((collection) => {
          if (collection.id() === this.id()) {
            return this;
          }
--- a/src/Explorer/Tree/ConflictId.ts
+++ b/src/Explorer/Tree/ConflictId.ts
@@ -1,4 +1,4 @@
-import { extractPartitionKeyValues } from "Utils/QueryUtils";
+import { extractPartitionKey } from "@azure/cosmos";
 import * as ko from "knockout";
 import * as Constants from "../../Common/Constants";
 import { readDocument } from "../../Common/dataAccess/readDocument";
@@ -42,7 +42,7 @@ export default class ConflictId {
    }
    this.partitionKeyProperty = container && container.partitionKeyProperty;
    this.partitionKey = container && container.partitionKey;
-    this.partitionKeyValue = extractPartitionKeyValues(this.parsedContent, this.partitionKey as any);
+    this.partitionKeyValue = extractPartitionKey(this.parsedContent, this.partitionKey as any);
    this.stringPartitionKeyValue = this.getPartitionKeyValueAsString();
    this.id = ko.observable(data.id);
    this.isDirty = ko.observable(false);
--- a/src/Explorer/Tree/ResourceTokenCollection.ts
+++ b/src/Explorer/Tree/ResourceTokenCollection.ts
@@ -156,6 +156,6 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas
  }

  public getDatabase(): ViewModels.Database {
-    return useDatabases.getState().findDatabaseWithId(this.databaseId, this.isSampleCollection);
+    return useDatabases.getState().findDatabaseWithId(this.databaseId);
  }
 }
--- a/src/Explorer/Tree/ResourceTree.tsx
+++ b/src/Explorer/Tree/ResourceTree.tsx
@@ -1,7 +1,6 @@
 import { Callout, DirectionalHint, ICalloutProps, ILinkProps, Link, Stack, Text } from "@fluentui/react";
 import { SampleDataTree } from "Explorer/Tree/SampleDataTree";
 import { getItemName } from "Utils/APITypeUtils";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import * as React from "react";
 import shallow from "zustand/shallow";
 import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
@@ -768,8 +767,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
  };

  const dataRootNode = buildDataTree();
-  const isSampleDataEnabled =
-    useQueryCopilot().copilotEnabled && userContext.sampleDataConnectionInfo && userContext.apiType === "SQL";
+  const isSampleDataEnabled = userContext.sampleDataConnectionInfo && userContext.apiType === "SQL";
  const sampleDataResourceTokenCollection = useDatabases((state) => state.sampleDataResourceTokenCollection);

  return (
--- a/src/Explorer/Tree2/useDatabaseTreeNodes.ts
+++ b/src/Explorer/Tree2/useDatabaseTreeNodes.ts
@@ -5,6 +5,7 @@ import { useDatabases } from "Explorer/useDatabases";
 import { useTabs } from "hooks/useTabs";
 import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
 import * as ViewModels from "../../Contracts/ViewModels";
+import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFactory";
 import Explorer from "../Explorer";
 import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
 import { useSelectedNode } from "../useSelectedNode";
@@ -21,7 +22,7 @@ export const useDatabaseTreeNodes = (container: Explorer, isNotebookEnabled: boo
      className: "databaseHeader",
      children: [],
      isSelected: () => useSelectedNode.getState().isDataNodeSelected(database.id()),
-      contextMenu: undefined, // TODO Disable this for now as the actions don't work. ResourceTreeContextMenuButtonFactory.createDatabaseContextMenu(container, database.id()),
+      contextMenu: ResourceTreeContextMenuButtonFactory.createDatabaseContextMenu(container, database.id()),
      onExpanded: async () => {
        useSelectedNode.getState().setSelectedNode(database);
        if (!databaseNode.children || databaseNode.children?.length === 0) {
--- a/src/Explorer/useDatabases.ts
+++ b/src/Explorer/useDatabases.ts
@@ -14,7 +14,7 @@ interface DatabasesState {
  deleteDatabase: (database: ViewModels.Database) => void;
  clearDatabases: () => void;
  isSaveQueryEnabled: () => boolean;
-  findDatabaseWithId: (databaseId: string, isSampleDatabase?: boolean) => ViewModels.Database;
+  findDatabaseWithId: (databaseId: string) => ViewModels.Database;
  isLastNonEmptyDatabase: () => boolean;
  findCollection: (databaseId: string, collectionId: string) => ViewModels.Collection;
  isLastCollection: () => boolean;
@@ -33,7 +33,7 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
  updateDatabase: (updatedDatabase: ViewModels.Database) =>
    set((state) => {
      const updatedDatabases = state.databases.map((database: ViewModels.Database) => {
-        if (database?.id() === updatedDatabase?.id()) {
+        if (database.id() === updatedDatabase.id()) {
          return updatedDatabase;
        }

@@ -67,9 +67,7 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
    }
    return true;
  },
-  findDatabaseWithId: (databaseId: string, isSampleDatabase?: boolean) => {
-    return get().databases.find((db) => databaseId === db.id() && db.isSampleDB === isSampleDatabase);
-  },
+  findDatabaseWithId: (databaseId: string) => get().databases.find((db) => databaseId === db.id()),
  isLastNonEmptyDatabase: () => {
    const databases = get().databases;
    return databases.length === 1 && (databases[0].collections()?.length > 0 || !!databases[0].offer());
--- a/src/HostedExplorer.tsx
+++ b/src/HostedExplorer.tsx
@@ -7,6 +7,9 @@ import "../less/hostedexplorer.less";
 import { AuthType } from "./AuthType";
 import { DatabaseAccount } from "./Contracts/DataModels";
 import "./Explorer/Menus/NavBar/MeControlComponent.less";
+import { useAADAuth } from "./hooks/useAADAuth";
+import { useConfig } from "./hooks/useConfig";
+import { useTokenMetadata } from "./hooks/usePortalAccessToken";
 import { HostedExplorerChildFrame } from "./HostedExplorerChildFrame";
 import { AccountSwitcher } from "./Platform/Hosted/Components/AccountSwitcher";
 import { ConnectExplorer } from "./Platform/Hosted/Components/ConnectExplorer";
@@ -17,9 +20,6 @@ import { SignInButton } from "./Platform/Hosted/Components/SignInButton";
 import "./Platform/Hosted/ConnectScreen.less";
 import { extractMasterKeyfromConnectionString } from "./Platform/Hosted/HostedUtils";
 import "./Shared/appInsights";
-import { useAADAuth } from "./hooks/useAADAuth";
-import { useConfig } from "./hooks/useConfig";
-import { useTokenMetadata } from "./hooks/usePortalAccessToken";

 initializeIcons();

--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -16,8 +16,9 @@ import "../externals/jquery.dataTables.min.css";
 import "../externals/jquery.typeahead.min.css";
 import "../externals/jquery.typeahead.min.js";
 // Image Dependencies
-import { Platform } from "ConfigContext";
 import { QueryCopilotCarousel } from "Explorer/QueryCopilot/CopilotCarousel";
+import { QueryCopilotFeedbackModal } from "Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal";
+import { useQueryCopilot } from "hooks/useQueryCopilot";
 import "../images/CosmosDB_rgb_ui_lighttheme.ico";
 import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
 import "../images/favicon.ico";
@@ -25,6 +26,8 @@ import "../less/TableStyles/CustomizeColumns.less";
 import "../less/TableStyles/EntityEditor.less";
 import "../less/TableStyles/fulldatatables.less";
 import "../less/TableStyles/queryBuilder.less";
+import * as StyleConstants from "./Common/StyleConstants";
+import { configContext, Platform } from "ConfigContext";
 import "../less/documentDB.less";
 import "../less/forms.less";
 import "../less/infobox.less";
@@ -34,7 +37,6 @@ import "../less/resourceTree.less";
 import "../less/tree.less";
 import { CollapsedResourceTree } from "./Common/CollapsedResourceTree";
 import { ResourceTreeContainer } from "./Common/ResourceTreeContainer";
-import * as StyleConstants from "./Common/StyleConstants";
 import "./Explorer/Controls/Accordion/AccordionComponent.less";
 import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less";
 import { Dialog } from "./Explorer/Controls/Dialog";
@@ -54,10 +56,10 @@ import { SidePanel } from "./Explorer/Panes/PanelContainerComponent";
 import "./Explorer/SplashScreen/SplashScreen.less";
 import { Tabs } from "./Explorer/Tabs/Tabs";
 import "./Libs/jquery";
-import { appThemeFabric } from "./Platform/Fabric/FabricTheme";
 import "./Shared/appInsights";
 import { useConfig } from "./hooks/useConfig";
 import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";
+import { appThemeFabric } from "./Platform/Fabric/FabricTheme";

 initializeIcons();

@@ -65,11 +67,11 @@ const App: React.FunctionComponent = () => {
  const [isLeftPaneExpanded, setIsLeftPaneExpanded] = useState<boolean>(true);
  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
  const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);
+  const shouldShowModal = useQueryCopilot((state) => state.showFeedbackModal);

  const config = useConfig();
  if (config?.platform === Platform.Fabric) {
    loadTheme(appThemeFabric);
-    import("../less/documentDBFabric.less");
  }
  StyleConstants.updateStyles();
  const explorer = useKnockoutExplorer(config?.platform);
@@ -89,6 +91,7 @@ const App: React.FunctionComponent = () => {

  return (
    <div className="flexContainer" aria-hidden="false">
+      <LoadFabricOverrides />
      <div id="divExplorer" className="flexContainer hideOverflows">
        <div id="freeTierTeachingBubble"> </div>
        {/* Main Command Bar - Start */}
@@ -133,12 +136,25 @@ const App: React.FunctionComponent = () => {
      {<SQLQuickstartTutorial />}
      {<MongoQuickstartTutorial />}
      {<QueryCopilotCarousel isOpen={isCopilotCarouselOpen} explorer={explorer} />}
+      {shouldShowModal && <QueryCopilotFeedbackModal explorer={explorer} />}
    </div>
  );
 };

-const mainElement = document.getElementById("Main");
-ReactDOM.render(<App />, mainElement);
+ReactDOM.render(<App />, document.body);
+
+function LoadFabricOverrides(): JSX.Element {
+  if (configContext.platform === Platform.Fabric) {
+    const FabricStyle = React.lazy(() => import("./Platform/Fabric/FabricPlatform"));
+    return (
+      <React.Suspense fallback={<div></div>}>
+        <FabricStyle />
+      </React.Suspense>
+    );
+  } else {
+    return <></>;
+  }
+}

 function LoadingExplorer(): JSX.Element {
  return (
--- a/src/Platform/Fabric/FabricPlatform.tsx
+++ b/src/Platform/Fabric/FabricPlatform.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+import "../../../less/documentDBFabric.less";
+// This is a dummy export, allowing us to conditionally import documentDBFabric.less
+// by lazy-importing this in Main.tsx (see LoadFabricOverrides() there)
+export default function InitFabric() {
+  return <></>;
+}
--- a/src/Platform/Fabric/FabricUtil.ts
+++ b/src/Platform/Fabric/FabricUtil.ts
@@ -1,53 +0,0 @@
-import { sendCachedDataMessage } from "Common/MessageHandler";
-import { FabricDatabaseConnectionInfo } from "Contracts/FabricContract";
-import { MessageTypes } from "Contracts/MessageTypes";
-import Explorer from "Explorer/Explorer";
-import { updateUserContext } from "UserContext";
-
-const TOKEN_VALIDITY_MS = (3600 - 600) * 1000; // 1 hour minus 10 minutes to be safe
-let timeoutId: NodeJS.Timeout;
-
-// Prevents multiple parallel requests
-let isRequestPending = false;
-
-export const requestDatabaseResourceTokens = (): void => {
-  if (isRequestPending) {
-    return;
-  }
-
-  // TODO Make Fabric return the message id so we can handle this promise
-  isRequestPending = true;
-  sendCachedDataMessage<FabricDatabaseConnectionInfo>(MessageTypes.GetAllResourceTokens, []);
-};
-
-export const handleRequestDatabaseResourceTokensResponse = (
-  explorer: Explorer,
-  fabricDatabaseConnectionInfo: FabricDatabaseConnectionInfo,
-): void => {
-  isRequestPending = false;
-  updateUserContext({ fabricDatabaseConnectionInfo });
-  scheduleRefreshDatabaseResourceToken();
-  explorer.refreshAllDatabases();
-};
-
-/**
- * Check token validity and schedule a refresh if necessary
- * @param tokenTimestamp
- * @returns
- */
-export const scheduleRefreshDatabaseResourceToken = (): void => {
-  if (timeoutId !== undefined) {
-    clearTimeout(timeoutId);
-    timeoutId = undefined;
-  }
-
-  timeoutId = setTimeout(() => {
-    requestDatabaseResourceTokens();
-  }, TOKEN_VALIDITY_MS);
-};
-
-export const checkDatabaseResourceTokensValidity = (tokenTimestamp: number): void => {
-  if (tokenTimestamp + TOKEN_VALIDITY_MS < Date.now()) {
-    requestDatabaseResourceTokens();
-  }
-};
--- a/src/Platform/Hosted/Components/ConnectExplorer.test.tsx
+++ b/src/Platform/Hosted/Components/ConnectExplorer.test.tsx
@@ -1,8 +1,6 @@
 jest.mock("../../../hooks/useDirectories");
 import "@testing-library/jest-dom";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { extractFeatures } from "Platform/Hosted/extractFeatures";
-import { updateUserContext, userContext } from "UserContext";
 import React from "react";
 import { ConnectExplorer } from "./ConnectExplorer";

@@ -18,24 +16,3 @@ it("shows the connect form", () => {
  fireEvent.click(screen.getByText("Connect to your account with connection string"));
  expect(screen.queryByPlaceholderText("Please enter a connection string")).toBeDefined();
 });
-
-it("hides the connection string link when feature.disableConnectionStringLogin is true", () => {
-  const connectionString = "fakeConnectionString";
-  const login = jest.fn();
-  const setConnectionString = jest.fn();
-  const setEncryptedToken = jest.fn();
-  const setAuthType = jest.fn();
-  const oldFeatures = userContext.features;
-
-  const params = new URLSearchParams({
-    "feature.disableConnectionStringLogin": "true",
-  });
-
-  const testFeatures = extractFeatures(params);
-  updateUserContext({ features: testFeatures });
-
-  render(<ConnectExplorer {...{ login, setEncryptedToken, setAuthType, connectionString, setConnectionString }} />);
-  expect(screen.queryByPlaceholderText("Connect to your account with connection string")).toBeNull();
-
-  updateUserContext({ features: oldFeatures });
-});
--- a/src/Platform/Hosted/Components/ConnectExplorer.tsx
+++ b/src/Platform/Hosted/Components/ConnectExplorer.tsx
@@ -1,5 +1,4 @@
 import { useBoolean } from "@fluentui/react-hooks";
-import { userContext } from "UserContext";
 import * as React from "react";
 import ConnectImage from "../../../../images/HdeConnectCosmosDB.svg";
 import ErrorImage from "../../../../images/error.svg";
@@ -30,18 +29,6 @@ export const fetchEncryptedToken = async (connectionString: string): Promise<str
  return decodeURIComponent(result.readWrite || result.read);
 };

-export const isAccountRestrictedForConnectionStringLogin = async (connectionString: string): Promise<boolean> => {
-  const headers = new Headers();
-  headers.append(HttpHeaders.connectionString, connectionString);
-  const url = configContext.BACKEND_ENDPOINT + "/api/guest/accountrestrictions/checkconnectionstringlogin";
-  const response = await fetch(url, { headers, method: "POST" });
-  if (!response.ok) {
-    throw response;
-  }
-
-  return (await response.text()) === "True";
-};
-
 export const ConnectExplorer: React.FunctionComponent<Props> = ({
  setEncryptedToken,
  login,
@@ -50,8 +37,6 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
  setConnectionString,
 }: Props) => {
  const [isFormVisible, { setTrue: showForm }] = useBoolean(false);
-  const [errorMessage, setErrorMessage] = React.useState("");
-  const enableConnectionStringLogin = !userContext.features.disableConnectionStringLogin;

  return (
    <div id="connectExplorer" className="connectExplorerContainer" style={{ display: "flex" }}>
@@ -61,19 +46,11 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
            <img src={ConnectImage} alt="Azure Cosmos DB" />
          </p>
          <p className="welcomeText">Welcome to Azure Cosmos DB</p>
-          {isFormVisible && enableConnectionStringLogin ? (
+          {isFormVisible ? (
            <form
              id="connectWithConnectionString"
              onSubmit={async (event) => {
                event.preventDefault();
-                setErrorMessage("");
-
-                if (await isAccountRestrictedForConnectionStringLogin(connectionString)) {
-                  setErrorMessage(
-                    "This account has been blocked from connection-string login. Please go to cosmos.azure.com/aad for AAD based login.",
-                  );
-                  return;
-                }

                if (isResourceTokenConnectionString(connectionString)) {
                  setAuthType(AuthType.ResourceToken);
@@ -97,12 +74,10 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
                    setConnectionString(event.target.value);
                  }}
                />
-                {errorMessage.length > 0 && (
-                  <span className="errorDetailsInfoTooltip">
-                    <img className="errorImg" src={ErrorImage} alt="Error notification" />
-                    <span className="errorDetails">{errorMessage}</span>
-                  </span>
-                )}
+                <span className="errorDetailsInfoTooltip" style={{ display: "none" }}>
+                  <img className="errorImg" src={ErrorImage} alt="Error notification" />
+                  <span className="errorDetails"></span>
+                </span>
              </p>
              <p className="connectExplorerContent">
                <input className="filterbtnstyle" type="submit" value="Connect" />
@@ -114,11 +89,9 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
          ) : (
            <div id="connectWithAad">
              <input className="filterbtnstyle" type="button" value="Sign In" onClick={login} />
-              {enableConnectionStringLogin && (
-                <p className="switchConnectTypeText" onClick={showForm}>
-                  Connect to your account with connection string
-                </p>
-              )}
+              <p className="switchConnectTypeText" onClick={showForm}>
+                Connect to your account with connection string
+              </p>
            </div>
          )}
        </div>
--- a/src/Platform/Hosted/ConnectScreen.less
+++ b/src/Platform/Hosted/ConnectScreen.less
@@ -66,7 +66,7 @@
 }
 .connectExplorerContainer .connectExplorer .connectExplorerContent .errorDetailsInfoTooltip .errorDetails {
  bottom: 24px;
-  width: 165px;
+  width: 145px;
  visibility: hidden;
  background-color: #393939;
  color: #ffffff;
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -14,7 +14,6 @@ export type Features = {
  readonly enableTtl: boolean;
  readonly executeSproc: boolean;
  readonly enableAadDataPlane: boolean;
-  readonly enableResourceGraph: boolean;
  readonly enableKoResourceTree: boolean;
  readonly hostedDataExplorer: boolean;
  readonly junoEndpoint?: string;
@@ -41,8 +40,6 @@ export type Features = {
  readonly disableCopilotPhoenixGateaway: boolean;
  readonly enableCopilotFullSchema: boolean;
  readonly copilotChatFixedMonacoEditorHeight: boolean;
-  readonly enablePriorityBasedExecution: boolean;
-  readonly disableConnectionStringLogin: boolean;

  // can be set via both flight and feature flag
  autoscaleDefault: boolean;
@@ -74,7 +71,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    canExceedMaximumValue: "true" === get("canexceedmaximumvalue"),
    cosmosdb: "true" === get("cosmosdb"),
    enableAadDataPlane: "true" === get("enableaaddataplane"),
-    enableResourceGraph: "true" === get("enableresourcegraph"),
    enableChangeFeedPolicy: "true" === get("enablechangefeedpolicy"),
    enableFixedCollectionWithSharedThroughput: "true" === get("enablefixedcollectionwithsharedthroughput"),
    enableKOPanel: "true" === get("enablekopanel"),
@@ -112,12 +108,10 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    enableLegacyMongoShellV2Debug: "true" === get("enablelegacymongoshellv2debug"),
    loadLegacyMongoShellFromBE: "true" === get("loadlegacymongoshellfrombe"),
    enableCopilot: "true" === get("enablecopilot", "true"),
-    copilotVersion: get("copilotversion") ?? "v2.0",
+    copilotVersion: get("copilotversion") ?? "v1.0",
    disableCopilotPhoenixGateaway: "true" === get("disablecopilotphoenixgateaway"),
    enableCopilotFullSchema: "true" === get("enablecopilotfullschema", "true"),
    copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
-    enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
-    disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
  };
 }

--- a/src/Shared/Constants.ts
+++ b/src/Shared/Constants.ts
@@ -208,9 +208,3 @@ export class FreeTierLimits {
  public static RU: number = 1000;
  public static Storage: number = 25;
 }
-
-export class QueryConstants {
-  public static readonly CancelQueryTitle: string = "Cancel query";
-  public static readonly CancelQuerySubTextTemplate: string = "{0} Do you want to cancel this query?";
-  public static readonly CancelQueryTimeoutThresholdReached: string = "The query timeout threshold has been reached.";
-}
--- a/src/Shared/StorageUtility.ts
+++ b/src/Shared/StorageUtility.ts
@@ -4,9 +4,6 @@ import * as SessionStorageUtility from "./SessionStorageUtility";
 export { LocalStorageUtility, SessionStorageUtility };
 export enum StorageKey {
  ActualItemPerPage,
-  QueryTimeoutEnabled,
-  QueryTimeout,
-  AutomaticallyCancelQueryAfterTimeout,
  ContainerPaginationEnabled,
  CustomItemPerPage,
  DatabaseAccountId,
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -133,10 +133,6 @@ export enum Action {
  CompleteUITour,
  OpenQueryCopilotFromSplashScreen,
  OpenQueryCopilotFromNewQuery,
-  ActivateQueryCopilot,
-  DeactivateQueryCopilot,
-  QueryGenerationFromCopilotPrompt,
-  QueryEdited,
  ExecuteQueryGeneratedFromQueryCopilot,
 }

--- a/src/Terminal/JupyterLabAppFactory.ts
+++ b/src/Terminal/JupyterLabAppFactory.ts
@@ -10,13 +10,9 @@ import { userContext } from "UserContext";
 export class JupyterLabAppFactory {
  private isShellStarted: boolean | undefined;
  private checkShellStarted: ((content: string | undefined) => void) | undefined;
-  private onShellExited: (restartShell: boolean) => void;
-  private restartShell: boolean;
+  private onShellExited: () => void;

  private isShellExited(content: string | undefined) {
-    if (userContext.apiType === "VCoreMongo" && content?.includes("MongoServerError: Invalid key")) {
-      this.restartShell = true;
-    }
    return content?.includes("cosmosuser@");
  }

@@ -36,11 +32,10 @@ export class JupyterLabAppFactory {
    this.isShellStarted = content?.includes("Enter password");
  }

-  constructor(closeTab: (restartShell: boolean) => void) {
+  constructor(closeTab: () => void) {
    this.onShellExited = closeTab;
    this.isShellStarted = false;
    this.checkShellStarted = undefined;
-    this.restartShell = false;

    switch (userContext.apiType) {
      case "Mongo":
@@ -74,7 +69,7 @@ export class JupyterLabAppFactory {
        if (!this.isShellStarted) {
          this.checkShellStarted(content);
        } else if (this.isShellExited(content)) {
-          this.onShellExited(this.restartShell);
+          this.onShellExited();
        }
      }
    }, this);
--- a/src/Terminal/index.ts
+++ b/src/Terminal/index.ts
@@ -11,8 +11,6 @@ import { JupyterLabAppFactory } from "./JupyterLabAppFactory";
 import { TerminalProps } from "./TerminalProps";
 import "./index.css";

-let session: ITerminalConnection | undefined;
-
 const createServerSettings = (props: TerminalProps): ServerConnection.ISettings => {
  let body: BodyInit | undefined;
  let headers: HeadersInit | undefined;
@@ -51,7 +49,7 @@ const createServerSettings = (props: TerminalProps): ServerConnection.ISettings
  return ServerConnection.makeSettings(options);
 };

-const initTerminal = async (props: TerminalProps): Promise<void> => {
+const initTerminal = async (props: TerminalProps): Promise<ITerminalConnection | undefined> => {
  // Initialize userContext (only properties which are needed by TelemetryProcessor)
  updateUserContext({
    subscriptionId: props.subscriptionId,
@@ -61,37 +59,28 @@ const initTerminal = async (props: TerminalProps): Promise<void> => {
  });

  const serverSettings = createServerSettings(props);
-
-  createTerminalApp(props, serverSettings);
-};
-
-const createTerminalApp = async (props: TerminalProps, serverSettings: ServerConnection.ISettings) => {
  const data = { baseUrl: serverSettings.baseUrl };
  const startTime = TelemetryProcessor.traceStart(Action.OpenTerminal, data);

  try {
-    session = await new JupyterLabAppFactory((restartShell: boolean) =>
-      closeTab(props, serverSettings, restartShell),
-    ).createTerminalApp(serverSettings);
+    const session = await new JupyterLabAppFactory(() => closeTab(props.tabId)).createTerminalApp(serverSettings);
    TelemetryProcessor.traceSuccess(Action.OpenTerminal, data, startTime);
+    return session;
  } catch (error) {
    TelemetryProcessor.traceFailure(Action.OpenTerminal, data, startTime);
-    session = undefined;
+    return undefined;
  }
 };

-const closeTab = (props: TerminalProps, serverSettings: ServerConnection.ISettings, restartShell: boolean): void => {
-  if (restartShell) {
-    createTerminalApp(props, serverSettings);
-  } else {
-    window.parent.postMessage(
-      { type: MessageTypes.CloseTab, data: { tabId: props.tabId }, signature: "pcIframe" },
-      window.document.referrer,
-    );
-  }
+const closeTab = (tabId: string): void => {
+  window.parent.postMessage(
+    { type: MessageTypes.CloseTab, data: { tabId: tabId }, signature: "pcIframe" },
+    window.document.referrer,
+  );
 };

 const main = async (): Promise<void> => {
+  let session: ITerminalConnection | undefined;
  postRobot.on(
    "props",
    {
@@ -102,7 +91,7 @@ const main = async (): Promise<void> => {
      // Typescript definition for event is wrong. So read props by casting to <any>
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
      const props = (event as any).data as TerminalProps;
-      await initTerminal(props);
+      session = await initTerminal(props);
    },
  );

--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -1,4 +1,3 @@
-import { FabricDatabaseConnectionInfo } from "Contracts/FabricContract";
 import { ParsedResourceTokenConnectionString } from "Platform/Hosted/Helpers/ResourceTokenUtils";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
@@ -48,7 +47,6 @@ export interface VCoreMongoConnectionParams {
 }

 interface UserContext {
-  readonly fabricDatabaseConnectionInfo?: FabricDatabaseConnectionInfo;
  readonly authType?: AuthType;
  readonly masterKey?: string;
  readonly subscriptionId?: string;
--- a/src/Utils/PriorityBasedExecutionUtils.ts
+++ b/src/Utils/PriorityBasedExecutionUtils.ts
@@ -1,15 +1,6 @@
 import * as Cosmos from "@azure/cosmos";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { PriorityLevel } from "../Common/Constants";
-import { userContext } from "../UserContext";
-
-export function isFeatureEnabled(): boolean {
-  return (
-    userContext.apiType === "SQL" &&
-    (userContext.databaseAccount?.properties?.enablePriorityBasedExecution ||
-      userContext.features.enablePriorityBasedExecution)
-  );
-}

 export function isRelevantRequest(requestContext: Cosmos.RequestContext): boolean {
  return (
@@ -29,7 +20,7 @@ export function getPriorityLevel(): PriorityLevel {
  }
 }

-export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, undefined, next) => {
+export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, next) => {
  if (isRelevantRequest(requestContext)) {
    const priorityLevel: PriorityLevel = getPriorityLevel();
    requestContext.headers["x-ms-cosmos-priority-level"] = priorityLevel as string;
--- a/src/Utils/QueryUtils.test.ts
+++ b/src/Utils/QueryUtils.test.ts
@@ -1,10 +1,8 @@
-import { PartitionKey, PartitionKeyDefinition, PartitionKeyKind } from "@azure/cosmos";
 import * as Q from "q";
 import * as sinon from "sinon";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import * as QueryUtils from "./QueryUtils";
-import { extractPartitionKeyValues } from "./QueryUtils";

 describe("Query Utils", () => {
  const generatePartitionKeyForPath = (path: string): DataModels.PartitionKey => {
@@ -96,69 +94,4 @@ describe("Query Utils", () => {
      expect(queryStub.getCall(0).args[0]).toBe(0);
    });
  });
-
-  describe("extractPartitionKey", () => {
-    const documentContent = {
-      "Volcano Name": "Adams",
-      Country: "United States",
-      Region: "US-Washington",
-      Location: {
-        type: "Point",
-        coordinates: [-121.49, 46.206],
-      },
-      Elevation: 3742,
-      Type: "Stratovolcano",
-      Status: "Tephrochronology",
-      "Last Known Eruption": "Last known eruption from A.D. 1-1499, inclusive",
-      id: "9e3c494e-8367-3f50-1f56-8c6fcb961363",
-      _rid: "xzo0AJRYUxUFAAAAAAAAAA==",
-      _self: "dbs/xzo0AA==/colls/xzo0AJRYUxU=/docs/xzo0AJRYUxUFAAAAAAAAAA==/",
-      _etag: '"ce00fa43-0000-0100-0000-652840440000"',
-      _attachments: "attachments/",
-      _ts: 1697136708,
-    };
-
-    it("should extract single partition key value", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/Elevation"],
-      };
-
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        singlePartitionKeyDefinition,
-      );
-      expect(partitionKeyValues.length).toBe(1);
-      expect(partitionKeyValues[0]).toEqual(3742);
-    });
-
-    it("should extract two partition key values", () => {
-      const multiPartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.MultiHash,
-        paths: ["/Type", "/Status"],
-      };
-      const expectedPartitionKeyValues: string[] = ["Stratovolcano", "Tephrochronology"];
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        multiPartitionKeyDefinition,
-      );
-      expect(partitionKeyValues.length).toBe(2);
-      expect(expectedPartitionKeyValues).toContain(documentContent["Type"]);
-      expect(expectedPartitionKeyValues).toContain(documentContent["Status"]);
-    });
-
-    it("should extract no partition key values", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/InvalidPartitionKeyPath"],
-      };
-
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        singlePartitionKeyDefinition,
-      );
-
-      expect(partitionKeyValues.length).toBe(0);
-    });
-  });
 });
--- a/src/Utils/QueryUtils.ts
+++ b/src/Utils/QueryUtils.ts
@@ -1,4 +1,3 @@
-import { PartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";

@@ -83,22 +82,3 @@ export const queryPagesUntilContentPresent = async (

  return await doRequest(firstItemIndex);
 };
-
-/* eslint-disable  @typescript-eslint/no-explicit-any */
-export const extractPartitionKeyValues = (
-  documentContent: any,
-  partitionKeyDefinition: PartitionKeyDefinition,
-): PartitionKey[] => {
-  if (!partitionKeyDefinition.paths || partitionKeyDefinition.paths.length === 0) {
-    return undefined;
-  }
-
-  const partitionKeyValues: PartitionKey[] = [];
-  partitionKeyDefinition.paths.forEach((partitionKeyPath: string) => {
-    const partitionKeyPathWithoutSlash: string = partitionKeyPath.substring(1);
-    if (documentContent[partitionKeyPathWithoutSlash]) {
-      partitionKeyValues.push(documentContent[partitionKeyPathWithoutSlash]);
-    }
-  });
-  return partitionKeyValues;
-};
--- a/src/explorer.html
+++ b/src/explorer.html
@@ -8,7 +8,5 @@
    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
  </head>

-  <body>
-    <div id="Main" style="height: 100%"></div>
-  </body>
+  <body></body>
 </html>
--- a/src/hooks/useDatabaseAccounts.tsx
+++ b/src/hooks/useDatabaseAccounts.tsx
@@ -1,9 +1,7 @@
-import { HttpHeaders } from "Common/Constants";
-import { QueryRequestOptions, QueryResponse } from "Contracts/AzureResourceGraph";
 import useSWR from "swr";
 import { configContext } from "../ConfigContext";
 import { DatabaseAccount } from "../Contracts/DataModels";
-/* eslint-disable  @typescript-eslint/no-explicit-any */
+import { userContext } from "../UserContext";

 interface AccountListResult {
  nextLink: string;
@@ -17,7 +15,7 @@ export async function fetchDatabaseAccounts(subscriptionId: string, accessToken:
  headers.append("Authorization", bearer);

  let accounts: Array<DatabaseAccount> = [];
-  const apiVersion = "2023-09-15-preview";
+  const apiVersion = userContext.features.enableThroughputCap ? "2021-10-15-preview" : "2021-06-15";
  let nextLink = `${configContext.ARM_ENDPOINT}/subscriptions/${subscriptionId}/providers/Microsoft.DocumentDB/databaseAccounts?api-version=${apiVersion}`;

  while (nextLink) {
@@ -33,56 +31,10 @@ export async function fetchDatabaseAccounts(subscriptionId: string, accessToken:
  return accounts.sort((a, b) => a.name.localeCompare(b.name));
 }

-export async function fetchDatabaseAccountsFromGraph(
-  subscriptionId: string,
-  accessToken: string,
-): Promise<DatabaseAccount[]> {
-  const headers = new Headers();
-  const bearer = `Bearer ${accessToken}`;
-
-  headers.append("Authorization", bearer);
-  headers.append(HttpHeaders.contentType, "application/json");
-  const databaseAccountsQuery = "resources | where type =~ 'microsoft.documentdb/databaseaccounts'";
-  const apiVersion = "2021-03-01";
-  const managementResourceGraphAPIURL = `${configContext.ARM_ENDPOINT}providers/Microsoft.ResourceGraph/resources?api-version=${apiVersion}`;
-
-  const databaseAccounts: DatabaseAccount[] = [];
-  let skipToken: string;
-  do {
-    const body = {
-      query: databaseAccountsQuery,
-      subscriptions: [subscriptionId],
-      ...(skipToken && {
-        options: {
-          $skipToken: skipToken,
-        } as QueryRequestOptions,
-      }),
-    };
-
-    const response = await fetch(managementResourceGraphAPIURL, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body),
-    });
-
-    if (!response.ok) {
-      throw new Error(await response.text());
-    }
-
-    const queryResponse: QueryResponse = (await response.json()) as QueryResponse;
-    skipToken = queryResponse.$skipToken;
-    queryResponse.data?.map((databaseAccount: any) => {
-      databaseAccounts.push(databaseAccount as DatabaseAccount);
-    });
-  } while (skipToken);
-
-  return databaseAccounts.sort((a, b) => a.name.localeCompare(b.name));
-}
-
 export function useDatabaseAccounts(subscriptionId: string, armToken: string): DatabaseAccount[] | undefined {
  const { data } = useSWR(
    () => (armToken && subscriptionId ? ["databaseAccounts", subscriptionId, armToken] : undefined),
-    (_, subscriptionId, armToken) => fetchDatabaseAccountsFromGraph(subscriptionId, armToken),
+    (_, subscriptionId, armToken) => fetchDatabaseAccounts(subscriptionId, armToken),
  );
  return data;
 }
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -1,19 +1,16 @@
 import { createUri } from "Common/UrlUtility";
-import { FabricDatabaseConnectionInfo, FabricMessage } from "Contracts/FabricContract";
+import { FabricMessage } from "Contracts/FabricContract";
 import Explorer from "Explorer/Explorer";
 import { useSelectedNode } from "Explorer/useSelectedNode";
-import {
-  handleRequestDatabaseResourceTokensResponse,
-  scheduleRefreshDatabaseResourceToken,
-} from "Platform/Fabric/FabricUtil";
+import { fetchEncryptedToken } from "Platform/Hosted/Components/ConnectExplorer";
 import { getNetworkSettingsWarningMessage } from "Utils/NetworkUtility";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
+import { fetchAccessData } from "hooks/usePortalAccessToken";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
 import { AuthType } from "../AuthType";
 import { AccountKind, Flights } from "../Common/Constants";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
-import { handleCachedDataMessage, sendMessage, sendReadyMessage } from "../Common/MessageHandler";
+import { sendMessage, sendReadyMessage } from "../Common/MessageHandler";
 import { Platform, configContext, updateConfigContext } from "../ConfigContext";
 import { ActionType, DataExplorerAction, TabKind } from "../Contracts/ActionContracts";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
@@ -58,21 +55,19 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
          userContext.features.phoenixNotebooks = true;
          userContext.features.phoenixFeatures = true;
        }
-        let explorer: Explorer;
        if (platform === Platform.Hosted) {
-          explorer = await configureHosted();
+          const explorer = await configureHosted();
+          setExplorer(explorer);
        } else if (platform === Platform.Emulator) {
-          explorer = configureEmulator();
+          const explorer = configureEmulator();
+          setExplorer(explorer);
        } else if (platform === Platform.Portal) {
-          explorer = await configurePortal();
+          const explorer = await configurePortal();
+          setExplorer(explorer);
        } else if (platform === Platform.Fabric) {
-          explorer = await configureFabric();
+          const explorer = await configureFabric();
+          setExplorer(explorer);
        }
-        if (explorer && userContext.features.enableCopilot) {
-          await updateContextForCopilot(explorer);
-          await updateContextForSampleData(explorer);
-        }
-        setExplorer(explorer);
      }
    };
    effect();
@@ -81,6 +76,9 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
  useEffect(() => {
    if (explorer) {
      applyExplorerBindings(explorer);
+      if (userContext.features.enableCopilot) {
+        updateContextForSampleData(explorer);
+      }
    }
  }, [explorer]);

@@ -102,37 +100,70 @@ async function configureFabric(): Promise<Explorer> {
        }

        const data: FabricMessage = event.data?.data;
+
        if (!data) {
          return;
        }

        switch (data.type) {
          case "initialize": {
-            const fabricDatabaseConnectionInfo: FabricDatabaseConnectionInfo = {
-              endpoint: data.message.endpoint,
-              databaseId: data.message.databaseId,
-              resourceTokens: data.message.resourceTokens as { [resourceId: string]: string },
-              resourceTokensTimestamp: data.message.resourceTokensTimestamp,
-            };
-            explorer = await createExplorerFabric(fabricDatabaseConnectionInfo);
-            resolve(explorer);
+            // TODO For now, retrieve info from session storage. Replace with info injected into Data Explorer
+            const connectionString = data.connectionString ?? sessionStorage.getItem("connectionString");
+            if (!connectionString) {
+              console.error("No connection string found in session storage");
+              return undefined;
+            }
+            const encryptedToken = await fetchEncryptedToken(connectionString);
+            // TODO Duplicated from useTokenMetadata
+            const encryptedTokenMetadata = await fetchAccessData(encryptedToken);

-            explorer.refreshAllDatabases().then(() => {
-              openFirstContainer(explorer, fabricDatabaseConnectionInfo.databaseId);
-            });
-            scheduleRefreshDatabaseResourceToken();
+            const hostedConfig: EncryptedToken = {
+              authType: AuthType.EncryptedToken,
+              encryptedToken,
+              encryptedTokenMetadata,
+            };
+
+            explorer = await configureWithEncryptedToken(hostedConfig);
+            resolve(explorer);
            break;
          }
          case "newContainer":
            explorer.onNewCollectionClicked();
            break;
-          case "authorizationToken": {
-            handleCachedDataMessage(data);
-            break;
-          }
-          case "allResourceTokens": {
-            // TODO call handleCachedDataMessage when Fabric echoes message id back
-            handleRequestDatabaseResourceTokensResponse(explorer, data.message as FabricDatabaseConnectionInfo);
+          case "openTab": {
+            // Expand database first
+            const databaseName = sessionStorage.getItem("openDatabaseName") ?? data.databaseName;
+            const database = useDatabases.getState().databases.find((db) => db.id() === databaseName);
+            if (database) {
+              await database.expandDatabase();
+              useDatabases.getState().updateDatabase(database);
+              useSelectedNode.getState().setSelectedNode(database);
+
+              let collectionResourceId = data.collectionName;
+              if (collectionResourceId === undefined) {
+                // Pick first collection if collectionName not specified in message
+                collectionResourceId = database.collections()[0]?.id();
+              }
+
+              if (collectionResourceId !== undefined) {
+                // Expand collection
+                const collection = database.collections().find((coll) => coll.id() === collectionResourceId);
+                collection.expandCollection();
+                useSelectedNode.getState().setSelectedNode(collection);
+
+                handleOpenAction(
+                  {
+                    actionType: ActionType.OpenCollectionTab,
+                    databaseResourceId: databaseName,
+                    collectionResourceId: data.collectionName,
+                    tabKind: TabKind.SQLDocuments,
+                  } as DataExplorerAction,
+                  useDatabases.getState().databases,
+                  explorer,
+                );
+              }
+            }
+
            break;
          }
          default:
@@ -147,41 +178,6 @@ async function configureFabric(): Promise<Explorer> {
  });
 }

-const openFirstContainer = async (explorer: Explorer, databaseName: string, collectionName?: string) => {
-  // Expand database first
-  databaseName = sessionStorage.getItem("openDatabaseName") ?? databaseName;
-  const database = useDatabases.getState().databases.find((db) => db.id() === databaseName);
-  if (database) {
-    await database.expandDatabase();
-    useDatabases.getState().updateDatabase(database);
-    useSelectedNode.getState().setSelectedNode(database);
-
-    let collectionResourceId = collectionName;
-    if (collectionResourceId === undefined) {
-      // Pick first collection if collectionName not specified in message
-      collectionResourceId = database.collections()[0]?.id();
-    }
-
-    if (collectionResourceId !== undefined) {
-      // Expand collection
-      const collection = database.collections().find((coll) => coll.id() === collectionResourceId);
-      collection.expandCollection();
-      useSelectedNode.getState().setSelectedNode(collection);
-
-      handleOpenAction(
-        {
-          actionType: ActionType.OpenCollectionTab,
-          databaseResourceId: databaseName,
-          collectionResourceId: collectionName,
-          tabKind: TabKind.SQLDocuments,
-        } as DataExplorerAction,
-        useDatabases.getState().databases,
-        explorer,
-      );
-    }
-  }
-};
-
 async function configureHosted(): Promise<Explorer> {
  const win = window as unknown as HostedExplorerChildFrame;
  let explorer: Explorer;
@@ -319,25 +315,6 @@ function configureHostedWithResourceToken(config: ResourceToken): Explorer {
  return explorer;
 }

-function createExplorerFabric(fabricDatabaseConnectionInfo: FabricDatabaseConnectionInfo): Explorer {
-  updateUserContext({
-    fabricDatabaseConnectionInfo,
-    authType: AuthType.ConnectionString,
-    databaseAccount: {
-      id: "",
-      location: "",
-      type: "",
-      name: "Mounted",
-      kind: AccountKind.Default,
-      properties: {
-        documentEndpoint: fabricDatabaseConnectionInfo.endpoint,
-      },
-    },
-  });
-  const explorer = new Explorer();
-  return explorer;
-}
-
 function configureWithEncryptedToken(config: EncryptedToken): Explorer {
  const apiExperience = DefaultExperienceUtility.getDefaultExperienceFromApiKind(config.encryptedTokenMetadata.apiKind);
  updateUserContext({
@@ -420,11 +397,9 @@ async function configurePortal(): Promise<Explorer> {
          updateContextsFromPortalMessage(inputs);
          explorer = new Explorer();
          resolve(explorer);
-
-          if (userContext.apiType === "Postgres" || userContext.apiType === "SQL" || userContext.apiType === "Mongo") {
-            setTimeout(() => explorer.openNPSSurveyDialog(), 3000);
+          if (userContext.apiType === "Postgres") {
+            explorer.openNPSSurveyDialog();
          }
-
          if (openAction) {
            handleOpenAction(openAction, useDatabases.getState().databases, explorer);
          }
@@ -556,23 +531,12 @@ interface PortalMessage {
  inputs?: DataExplorerInputsFrame;
 }

-async function updateContextForCopilot(explorer: Explorer): Promise<void> {
-  await explorer.configureCopilot();
-}
-
 async function updateContextForSampleData(explorer: Explorer): Promise<void> {
-  const copilotEnabled =
-    userContext.apiType === "SQL" && userContext.features.enableCopilot && useQueryCopilot.getState().copilotEnabled;
-
-  if (!copilotEnabled) {
+  if (!userContext.features.enableCopilot) {
    return;
  }

-  const sampleDatabaseEndpoint = useQueryCopilot.getState().copilotUserDBEnabled
-    ? `/api/tokens/sampledataconnection/v2`
-    : `/api/tokens/sampledataconnection`;
-
-  const url = createUri(`${configContext.BACKEND_ENDPOINT}`, sampleDatabaseEndpoint);
+  const url = createUri(`${configContext.BACKEND_ENDPOINT}`, `/api/tokens/sampledataconnection`);
  const authorizationHeader = getAuthorizationHeader();
  const headers = { [authorizationHeader.header]: authorizationHeader.token };

--- a/src/hooks/useQueryCopilot.ts
+++ b/src/hooks/useQueryCopilot.ts
@@ -1,6 +1,6 @@
 import { MinimalQueryIterator } from "Common/IteratorUtilities";
 import { QueryResults } from "Contracts/ViewModels";
-import { CopilotMessage, CopilotSchemaAllocationInfo } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
+import { CopilotMessage } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
 import { guid } from "Explorer/Tables/Utilities";
 import { useTabs } from "hooks/useTabs";
 import create, { UseStore } from "zustand";
@@ -8,8 +8,6 @@ import * as DataModels from "../Contracts/DataModels";
 import { ContainerInfo } from "../Contracts/DataModels";

 export interface QueryCopilotState {
-  copilotEnabled: boolean;
-  copilotUserDBEnabled: boolean;
  generatedQuery: string;
  likeQuery: boolean;
  userPrompt: string;
@@ -32,25 +30,17 @@ export interface QueryCopilotState {
  showFeedbackBar: boolean;
  showCopyPopup: boolean;
  showErrorMessageBar: boolean;
-  showInvalidQueryMessageBar: boolean;
  generatedQueryComments: string;
  wasCopilotUsed: boolean;
  showWelcomeSidebar: boolean;
-  showWelcomeModal: boolean;
  showCopilotSidebar: boolean;
  chatMessages: CopilotMessage[];
  shouldIncludeInMessages: boolean;
  showExplanationBubble: boolean;
  notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo;
  containerStatus: ContainerInfo;
-  schemaAllocationInfo: CopilotSchemaAllocationInfo;
  isAllocatingContainer: boolean;
-  copilotEnabledforExecution: boolean;

-  getState?: () => QueryCopilotState;
-
-  setCopilotEnabled: (copilotEnabled: boolean) => void;
-  setCopilotUserDBEnabled: (copilotUserDBEnabled: boolean) => void;
  openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) => void;
  closeFeedbackModal: () => void;
  setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) => void;
@@ -74,11 +64,9 @@ export interface QueryCopilotState {
  setShowFeedbackBar: (showFeedbackBar: boolean) => void;
  setshowCopyPopup: (showCopyPopup: boolean) => void;
  setShowErrorMessageBar: (showErrorMessageBar: boolean) => void;
-  setShowInvalidQueryMessageBar: (showInvalidQueryMessageBar: boolean) => void;
  setGeneratedQueryComments: (generatedQueryComments: string) => void;
  setWasCopilotUsed: (wasCopilotUsed: boolean) => void;
  setShowWelcomeSidebar: (showWelcomeSidebar: boolean) => void;
-  setShowWelcomeModal: (showWelcomeModal: boolean) => void;
  setShowCopilotSidebar: (showCopilotSidebar: boolean) => void;
  setChatMessages: (chatMessages: CopilotMessage[]) => void;
  setShouldIncludeInMessages: (shouldIncludeInMessages: boolean) => void;
@@ -86,8 +74,6 @@ export interface QueryCopilotState {
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
  setContainerStatus: (containerStatus: ContainerInfo) => void;
  setIsAllocatingContainer: (isAllocatingContainer: boolean) => void;
-  setSchemaAllocationInfo: (schemaAllocationInfo: CopilotSchemaAllocationInfo) => void;
-  setCopilotEnabledforExecution: (copilotEnabledforExecution: boolean) => void;

  resetContainerConnection: () => void;
  resetQueryCopilotStates: () => void;
@@ -96,8 +82,6 @@ export interface QueryCopilotState {
 type QueryCopilotStore = UseStore<QueryCopilotState>;

 export const useQueryCopilot: QueryCopilotStore = create((set) => ({
-  copilotEnabled: false,
-  copilotUserDBEnabled: false,
  generatedQuery: "",
  likeQuery: false,
  userPrompt: "",
@@ -120,11 +104,9 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
  showFeedbackBar: false,
  showCopyPopup: false,
  showErrorMessageBar: false,
-  showInvalidQueryMessageBar: false,
  generatedQueryComments: "",
  wasCopilotUsed: false,
  showWelcomeSidebar: true,
-  showWelcomeModal: true,
  showCopilotSidebar: false,
  chatMessages: [],
  shouldIncludeInMessages: true,
@@ -139,18 +121,11 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
    durationLeftInMinutes: undefined,
    phoenixServerInfo: undefined,
  },
-  schemaAllocationInfo: {
-    databaseId: undefined,
-    containerId: undefined,
-  },
  isAllocatingContainer: false,
-  copilotEnabledforExecution: false,

-  setCopilotEnabled: (copilotEnabled: boolean) => set({ copilotEnabled }),
-  setCopilotUserDBEnabled: (copilotUserDBEnabled: boolean) => set({ copilotUserDBEnabled }),
  openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) =>
    set({ generatedQuery, likeQuery, userPrompt, showFeedbackModal: true }),
-  closeFeedbackModal: () => set({ showFeedbackModal: false }),
+  closeFeedbackModal: () => set({ generatedQuery: "", likeQuery: false, userPrompt: "", showFeedbackModal: false }),
  setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) =>
    set({ hideFeedbackModalForLikedQueries }),
  refreshCorrelationId: () => set({ correlationId: guid() }),
@@ -173,11 +148,9 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
  setShowFeedbackBar: (showFeedbackBar: boolean) => set({ showFeedbackBar }),
  setshowCopyPopup: (showCopyPopup: boolean) => set({ showCopyPopup }),
  setShowErrorMessageBar: (showErrorMessageBar: boolean) => set({ showErrorMessageBar }),
-  setShowInvalidQueryMessageBar: (showInvalidQueryMessageBar: boolean) => set({ showInvalidQueryMessageBar }),
  setGeneratedQueryComments: (generatedQueryComments: string) => set({ generatedQueryComments }),
  setWasCopilotUsed: (wasCopilotUsed: boolean) => set({ wasCopilotUsed }),
  setShowWelcomeSidebar: (showWelcomeSidebar: boolean) => set({ showWelcomeSidebar }),
-  setShowWelcomeModal: (showWelcomeModal: boolean) => set({ showWelcomeModal }),
  setShowCopilotSidebar: (showCopilotSidebar: boolean) => set({ showCopilotSidebar }),
  setChatMessages: (chatMessages: CopilotMessage[]) => set({ chatMessages }),
  setShouldIncludeInMessages: (shouldIncludeInMessages: boolean) => set({ shouldIncludeInMessages }),
@@ -186,8 +159,6 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
    set({ notebookServerInfo }),
  setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
  setIsAllocatingContainer: (isAllocatingContainer: boolean) => set({ isAllocatingContainer }),
-  setSchemaAllocationInfo: (schemaAllocationInfo: CopilotSchemaAllocationInfo) => set({ schemaAllocationInfo }),
-  setCopilotEnabledforExecution: (copilotEnabledforExecution: boolean) => set({ copilotEnabledforExecution }),

  resetContainerConnection: (): void => {
    useTabs.getState().closeAllNotebookTabs(true);
@@ -198,10 +169,6 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
      durationLeftInMinutes: undefined,
      phoenixServerInfo: undefined,
    });
-    useQueryCopilot.getState().setSchemaAllocationInfo({
-      databaseId: undefined,
-      containerId: undefined,
-    });
  },

  resetQueryCopilotStates: () => {
@@ -229,7 +196,6 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
      showFeedbackBar: false,
      showCopyPopup: false,
      showErrorMessageBar: false,
-      showInvalidQueryMessageBar: false,
      generatedQueryComments: "",
      wasCopilotUsed: false,
      showCopilotSidebar: false,
@@ -246,10 +212,6 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
        durationLeftInMinutes: undefined,
        phoenixServerInfo: undefined,
      },
-      schemaAllocationInfo: {
-        databaseId: undefined,
-        containerId: undefined,
-      },
      isAllocatingContainer: false,
    }));
  },
--- a/src/hooks/useSubscriptions.tsx
+++ b/src/hooks/useSubscriptions.tsx
@@ -1,9 +1,6 @@
-import { HttpHeaders } from "Common/Constants";
-import { QueryRequestOptions, QueryResponse } from "Contracts/AzureResourceGraph";
 import useSWR from "swr";
 import { configContext } from "../ConfigContext";
 import { Subscription } from "../Contracts/DataModels";
-/* eslint-disable  @typescript-eslint/no-explicit-any */

 interface SubscriptionListResult {
  nextLink: string;
@@ -35,58 +32,10 @@ export async function fetchSubscriptions(accessToken: string): Promise<Subscript
  return subscriptions.sort((a, b) => a.displayName.localeCompare(b.displayName));
 }

-export async function fetchSubscriptionsFromGraph(accessToken: string): Promise<Subscription[]> {
-  const headers = new Headers();
-  const bearer = `Bearer ${accessToken}`;
-
-  headers.append("Authorization", bearer);
-  headers.append(HttpHeaders.contentType, "application/json");
-  const subscriptionsQuery =
-    "resources | where type == 'microsoft.documentdb/databaseaccounts' | join kind=inner ( resourcecontainers | where type == 'microsoft.resources/subscriptions' | project subscriptionId, subscriptionName = name, subscriptionState = tostring(parse_json(properties).state) ) on subscriptionId |  summarize by subscriptionId, subscriptionName, subscriptionState";
-  const apiVersion = "2021-03-01";
-  const managementResourceGraphAPIURL = `${configContext.ARM_ENDPOINT}providers/Microsoft.ResourceGraph/resources?api-version=${apiVersion}`;
-
-  const subscriptions: Subscription[] = [];
-  let skipToken: string;
-  do {
-    const body = {
-      query: subscriptionsQuery,
-      ...(skipToken && {
-        options: {
-          $skipToken: skipToken,
-        } as QueryRequestOptions,
-      }),
-    };
-
-    const response = await fetch(managementResourceGraphAPIURL, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body),
-    });
-
-    if (!response.ok) {
-      throw new Error(await response.text());
-    }
-
-    const queryResponse: QueryResponse = (await response.json()) as QueryResponse;
-    skipToken = queryResponse.$skipToken;
-
-    queryResponse.data?.map((subscription: any) => {
-      subscriptions.push({
-        displayName: subscription.subscriptionName,
-        subscriptionId: subscription.subscriptionId,
-        state: subscription.subscriptionState,
-      } as Subscription);
-    });
-  } while (skipToken);
-
-  return subscriptions.sort((a, b) => a.displayName.localeCompare(b.displayName));
-}
-
 export function useSubscriptions(armToken: string): Subscription[] | undefined {
  const { data } = useSWR(
    () => (armToken ? ["subscriptions", armToken] : undefined),
-    (_, armToken) => fetchSubscriptionsFromGraph(armToken),
+    (_, armToken) => fetchSubscriptions(armToken),
  );
  return data;
 }
--- a/src/hooks/useTabs.ts
+++ b/src/hooks/useTabs.ts
@@ -5,7 +5,7 @@ import NotebookTabV2 from "../Explorer/Tabs/NotebookV2Tab";
 import TabsBase from "../Explorer/Tabs/TabsBase";
 import { Platform, configContext } from "./../ConfigContext";

-export interface TabsState {
+interface TabsState {
  openedTabs: TabsBase[];
  openedReactTabs: ReactTabKind[];
  activeTab: TabsBase | undefined;
--- a/web.config
+++ b/web.config
@@ -6,15 +6,6 @@
      <mimeMap fileExtension="woff" mimeType="application/font-woff" />
    </staticContent>
    <rewrite>
-      <rules>
-        <rule name="AAD-Redirect" stopProcessing="true">
-          <match url="^aad" ignoreCase="true"/>
-          <conditions>
-            <add input="{HTTP_HOST}" pattern="^cosmos.azure.com" />
-          </conditions>
-          <action type="Redirect" url="/?feature.enableAadDataPlane=true&amp;feature.disableConnectionStringLogin=true" redirectType="Permanent" />
-        </rule>
-      </rules>
      <outboundRules>
        <rule name="Strict-Transport-Security" enabled="true">
          <match serverVariable="RESPONSE_Strict_Transport_Security" pattern=".*" />