proper uri handling