improved peek request handling