Fix bugs
Fix bug with url generating