improve getAllUrls()