Url bugs fixed