GTNPORTAL-3214 / GTNPORTAL-3215 Fixes to api serialization