setBy* -> admin* and hndl -> query name changes