fixing issues with broker fetch requests