urls parsing fixes