Allow manual shard selection using query keyword
Fix recursion errors seen when updating subscriptions for volumes
with many issues.

Change from using nested tasklets to doing two parallel bulk queries
and then looping over the results.