Reworking queries to generate more at the start