Auto-refresh improvements