Added query track and tooltips