fix collection oading & key names