Improve query overview for version validation