Restore previous ProgramListing and add Table support