Shorten the query even more