Add some stuff to parse url
fix bug for returning from parse url