Fixed a bunch of bugs around displaying collections.