This commit fixes an issue created by a function name change in the latest Collection Solution Pack. It also enhances the List/Grid links to highlight the active view when browsing and searching.