added uri encoding