Updated json_decode calls to fallback to returning the value itself where null.