query scrape fixes