Issue #226 refresh enhancements