added url escapaing