url parsing fixes