Fix errors when changing to scope or value that is filtered out.

Current spec status: 595 examples, 0 failures in 5.26 seconds.