Upgrade facade

fixes missing info when we convert from page / screen to track, this pr also fixes all broken  tests.