applying markup type for composite tokens
make rollback work
make saving dictionary work