Improving some refresh behavior