Adding fixes for collections table and capitalization