Fixed multiple issues with discovery requests, should be mover robust now