changed url construction a bit