This fixes some issues where the AppController was still manipulating
the local scope and causing the UI to become out of sync.