Started refactoring of url::build to url::buildQuery