fix standalone requests to fetch from data source