Improve query section