Fetch URL when fetching objects, rather than with query results
Fix test