Albums/collections page: fix some issues
Albums/collections dix some issues (part2)