Fixes for tank update, restoring org on refresh