Adjusted data load progress and uri escapes