improve the query
improve