Partial resolution of page refresh issue