fixed parsing from url