Hi David,
Will look into this in more detail later.
It comes down to finding a good collection. I have uploaded the PGN file from your next post and have it available here:
Note: have not tested it yet, but a short glance at the file looks promising - let me know if it works for you using the "advanced > create practice set". (so it will be available in the practice option - not the puzzles - that format is different).
Best regards,
Jeroen