Fixes for new data requests workflow