Scopes were moved to properties area, so need to adjust
the optimization part of tagging.
Ideally, tagging will always happen (and happen for free)
and then drawing code will update scopes when they are
actually displayed. But this is outside of the scope of
this fix since requires some design changes.
e7dfe15702