Improved UI for query