Fix bugs when a key can point to an object or a plain value + Improvements for this case on what we display