Fixes for bad lookups in collection view (bug 951348)