Don't update queries until after model refresh
Merge branch 'delay-requery'