Include geometry filter for download URLs, too

Fix for #1304 
Part of the problem in this area of code is that so many of the names have become meaningless. It made fixing #1276 much harder than it should have been. We should continue to tidy them up as we work in this area.