[part 5] - improve the query