Fixed updating and removing pages