Fix bucket view