Fixes to UriFetchingQueryExecutor to avoid duplicate key problems