Updated filter to use new scope formats.