fixing mixed value encodings and merging key value streams fixes