Fixed navigation uri not being built properly