Avoid double-query on csubs/casubs collections

Fixes issue #371 
Fixed in ed0da3e