url fix & bug fix