Merge pull request #1140 from stevewithington/develop

bug fix: folder & rating display issues
Adding indexes for comments