Added normalize for uri