More fixes and starting to create the show filtering