Use URI.Builder instead of manipulating Strings URL