Primary collection re-rendering fixes

Fixes two issues with re-rendering primary collections. See unit tests added.