Links fixes and Non-array embedded serialization fix