Updated views and controllers to find zipped collections more efficiently