fixing more data keys'