Uri too long temporary fixes