3418 Change scope, add test

Resolves BoT-DB: https://code.google.com/p/otwarchive/issues/detail?id=3418

Enigel worked out a new Scope that solved the problem.