Fixes #67 by indexing per range, not per org name

As noted. Ready for testing.