autorest find improvements (prepared)