some more fixes  after removal of _sid fields