Making damsolrizer more robust