[TASK] adjust to safe requests