BuildUrl method was improved