Back to lazy generation of Query