Correction of url parsing/recomposing - have to check for the $ in URL