ENG-7215: merge missing query ui fixes.