Query Commands added, UI components updated!
Merge origin/master
UI updated.