Fixed to handle RG site update. I think all existing features work again