Fixes for communities refresh scenario