simplify KV extraction
more special cases
wip