First attempt at better expanded collection handling.
Fix for not expanding first level.