fix data keys loading