Add self.CurrentPageVerified flag checking