radius search back port changes from 3.1