Fix collections visibility. Cleanup controller