Refresh option improved, but there are some cases to change