Replace String with URI #1544
Replace manual URI fragment parsing with utility methods