an upgrade fix and further pubIds porting

Happy to see all this stuff move over to the new UI structures!