Fixed URL and location trimming in PSI scraper