Corrected collection panel related issues