Collection refresh, change emit fix