add zencoding and bugfix for unmapping keys