Better handling of raw string keys
Fix issues with different http content-type