Avoid double-query on csubs/casubs collections

This is the "double query" on csbus collection that we are avoiding this the fix in this PR.