Batch of collection page bug fixes