Improve query results