Avoid double-query on csubs/casubs collections

Fixes issue #371