Improved query UI.