build_uri return added