Fix /fetch functionality to be compatible with recent refactor