Improve user experience in terms of performance

Changelog: fixed
Co-authored-by: Phil Hughes <me@iamphill.com>
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>