Use collection.Update instead of a mixed query

This is simpler and is also allows for an atomic update.