update and fix collection and drag