Split/add and fixes

as long as you're changing this, you may as well make it `unicode(strip_key(value))`