issue #20851: be more general about data type restriction in discovery
issue #20851: remove hardcoded admin