Fix sort bug
Handle url properly