Update URLGenerator. Fix arguments and ending /