fixed bug: empty kv pairs in map