Improvement the query