Fix context problem where it was not updated for new sites