Updated js uri generation