Making some final tweaks to account for user having nothing in their collection