Making the most of $Query