CMS-1564 Typescript: Smaller fixes in space app - polishing