Update for Wakanda 6 final

Moved Query and Combo box out of Tabview to allow click events again