Use Either the distinguish between success and failure of getting a collection
Clean up some code around refresh of Query
Add logging for when a collection fails to update
Merge branch 'collection-refresh'