Addressed refresh issue