Fixing the indexing on the uri parts