Improve refresh behavior