Fix collection viewer