ENG-31152 - Combobox live query fix.