Page refresh and URL sharing fixed